3rd attempt at fixing 42957. Replaces PRs 1095, 1896 #6622

Job	Run time
Core running from src / Core running from src / Linux	1m 49s
Core running from build / Core running from build / Linux	1m 58s
Core running from build / Core running from build / Windows	4m 8s
Core running from src / Core running from src / Windows	4m 7s
Core running from build / Core running from build / MacOS	1m 56s
Core running from src / Core running from src / MacOS	1m 47s
Gutenberg running from build / Gutenberg running from build / Linux	8m 0s
Gutenberg running from src / Gutenberg running from src / Linux	7m 58s
Gutenberg running from build / Gutenberg running from build / Windows	11m 59s
Gutenberg running from src / Gutenberg running from src / Windows	11m 44s
Gutenberg running from build / Gutenberg running from build / MacOS	7m 5s
Gutenberg running from src / Gutenberg running from src / MacOS	17m 11s
Slack Notifications	0s
Failed workflow tasks	0s
	1h 19m 42s

Provide feedback