Merge branch 'develop' into revert-6003-cristi/w-17568713 #5046

Job	Run time
build-and-test / build-all / build-all	3m 51s
build-and-test / unit-tests / windows-unit-tests / windows-unit-tests	7m 25s
build-and-test / unit-tests / linux-unit-tests / linux-unit-tests	5m 15s
	16m 31s

Provide feedback