Merge pull request #2221 from ERGO-Code/fix-2220 #2867

Job	Run time
debug_all_tests (macos-latest)	22m 17s
debug (macos-latest)	17m 25s
debug64 (macos-latest)	9m 52s
debug64_all_tests (macos-latest)	21m 59s
release (macos-latest)	14m 52s
release_all_tests (macos-latest)	13m 38s
Release64_all_tests (macos-latest)	14m 22s
Release64 (macos-latest)	15m 43s
	2h 10m 8s

Provide feedback