Needed to merge the two PRs here #518

Job	Run time
Tests on macos-latest-shard 1	32m 50s
Tests on macos-latest-shard 2	16m 29s
Tests on macos-latest-shard 3	21m 45s
Tests on macos-latest-shard 4	14m 25s
Tests on macos-latest-shard 5	8m 59s
Tests on macos-latest-shard 6	15m 11s
Tests on windows-latest-shard 1	15m 57s
Tests on windows-latest-shard 2	13m 39s
Tests on windows-latest-shard 3	17m 12s
Tests on windows-latest-shard 4	14m 19s
Tests on windows-latest-shard 5	9m 6s
Tests on windows-latest-shard 6	13m 14s
	3h 13m 6s

Provide feedback