feat: cherry-pick pr #5949 #995

Job	Run time
Run cypress tests (osd:ciGroup1)	18m 16s
Run cypress tests (osd:ciGroup2)	20m 10s
Run cypress tests (osd:ciGroup3)	14m 34s
Run cypress tests (osd:ciGroup4)	22m 16s
Run cypress tests (osd:ciGroup5)	20m 17s
Run cypress tests (osd:ciGroup6)	32m 9s
Run cypress tests (osd:ciGroup7)	27m 27s
Run cypress tests (osd:ciGroup8)	26m 53s
Run cypress tests (osd:ciGroup9)	21m 35s
add-comment	0s
	3h 23m 37s

Provide feedback