Strong-branching refactor #3688

Job	Run time
debug_all_tests (macos-latest)	15m 3s
release (macos-latest)	6m 15s
debug (macos-latest)	10m 40s
Release64 (macos-latest)	12m 36s
release_all_tests (macos-latest)	12m 13s
debug64 (macos-latest)	20m 48s
debug64_all_tests (macos-latest)	13m 48s
Release64_all_tests (macos-latest)	28m 39s
	2h 0m 2s

Provide feedback