Merge pull request #2838 from ERGO-Code/fix-2816 #5660

Job	Run time
Release64 (macos-latest)	18m 38s
release (macos-latest)	43m 56s
debug_all_tests (macos-latest)	48m 26s
debug64 (macos-latest)	20m 5s
release_all_tests (macos-latest)	28m 39s
debug (macos-latest)	31m 41s
Release64_all_tests (macos-latest)	35m 19s
debug64_all_tests (macos-latest)	16m 44s
	4h 3m 28s

Provide feedback