Merge pull request #2438 from fwesselm/fix-2432 #4823

Job	Run time
release (ubuntu-latest)	3m 40s
debug64 (ubuntu-latest)	4m 11s
debug (ubuntu-latest)	4m 50s
debug64_all_tests (ubuntu-latest)	4m 58s
debug_all_tests (ubuntu-latest)	5m 7s
release_all_tests (ubuntu-latest)	3m 43s
Release64_all_tests (ubuntu-latest)	3m 49s
Release64 (ubuntu-latest)	3m 50s
	34m 8s

Provide feedback