Merge pull request #2225 from ERGO-Code/fix-2223 #2874

Job	Run time
debug (macos-latest)	8m 8s
debug_all_tests (macos-latest)	15m 43s
debug64_all_tests (macos-latest)	19m 45s
debug64 (macos-latest)	13m 49s
release (macos-latest)	11m 0s
release_all_tests (macos-latest)	11m 49s
Release64 (macos-latest)	20m 54s
Release64_all_tests (macos-latest)	8m 33s
	1h 49m 41s

Provide feedback