Backport #760 to 2.x #2527

Job	Run time
test-and-build (11, ubuntu-latest, ism)	24m 46s
test-and-build (11, ubuntu-latest, non-ism)	16m 36s
test-and-build (11, windows-latest, ism)	7m 25s
test-and-build (11, windows-latest, non-ism)	6m 36s
test-and-build (11, macos-latest, ism)	9m 4s
test-and-build (11, macos-latest, non-ism)	9m 15s
test-and-build (17, ubuntu-latest, ism)	23m 31s
test-and-build (17, ubuntu-latest, non-ism)	14m 47s
test-and-build (17, windows-latest, ism)	5m 27s
test-and-build (17, windows-latest, non-ism)	5m 29s
test-and-build (17, macos-latest, ism)	6m 52s
test-and-build (17, macos-latest, non-ism)	5m 5s
	2h 14m 53s

Provide feedback