Merge pull request #2450 from ERGO-Code/fix-2419 #3707

Job	Run time
debug_all_tests (macos-latest)	16m 24s
debug (macos-latest)	11m 41s
debug64 (macos-latest)	9m 41s
release_all_tests (macos-latest)	15m 28s
Release64_all_tests (macos-latest)	12m 24s
release (macos-latest)	17m 24s
debug64_all_tests (macos-latest)	19m 58s
Release64 (macos-latest)	14m 53s
	1h 57m 53s

Provide feedback