Merged fix-2460 into this branch by hand! #5754

Job	Run time
release (ubuntu-latest)	3m 49s
debug_all_tests (ubuntu-latest)	5m 7s
debug (ubuntu-latest)	5m 0s
debug64_all_tests (ubuntu-latest)	5m 1s
release_all_tests (ubuntu-latest)	3m 52s
debug64 (ubuntu-latest)	4m 25s
Release64_all_tests (ubuntu-latest)	3m 54s
Release64 (ubuntu-latest)	4m 2s
	35m 10s

Provide feedback