Merge pull request #2451 from fwesselm/moreConstAgain #3706

Job	Run time
debug (macos-latest)	9m 14s
release (macos-latest)	10m 27s
release_all_tests (macos-latest)	11m 39s
debug64_all_tests (macos-latest)	17m 28s
Release64_all_tests (macos-latest)	19m 10s
debug_all_tests (macos-latest)	18m 34s
Release64 (macos-latest)	6m 17s
debug64 (macos-latest)	13m 55s
	1h 46m 44s

Provide feedback