Backport issue #998 to 2.x #2708

Job	Run time
test-and-build-windows-macos (11, windows-latest, ism)	3m 29s
test-and-build-windows-macos (11, windows-latest, non-ism)	3m 39s
test-and-build-windows-macos (11, macos-latest, ism)	4m 42s
test-and-build-windows-macos (11, macos-latest, non-ism)	3m 7s
test-and-build-windows-macos (17, windows-latest, ism)	3m 35s
test-and-build-windows-macos (17, windows-latest, non-ism)	3m 27s
test-and-build-windows-macos (17, macos-latest, ism)	4m 34s
test-and-build-windows-macos (17, macos-latest, non-ism)	4m 2s
Get-CI-Image-Tag / Get-CI-Image-Tag	3s
test-and-build-linux (11, ism)	3m 49s
test-and-build-linux (11, non-ism)	3m 57s
test-and-build-linux (17, ism)	3m 55s
test-and-build-linux (17, non-ism)	3m 45s
	46m 4s

Provide feedback