Merge pull request #2227 from ERGO-Code/fix-2223 #2878

Job	Run time
debug (macos-latest)	8m 43s
debug_all_tests (macos-latest)	12m 21s
release (macos-latest)	11m 22s
release_all_tests (macos-latest)	11m 47s
debug64 (macos-latest)	14m 4s
Release64 (macos-latest)	7m 55s
debug64_all_tests (macos-latest)	13m 58s
Release64_all_tests (macos-latest)	20m 17s
	1h 40m 27s

Provide feedback