Merge branch '3.3.x'
Merge pull request #6878 from marc1706/ticket/17555 [ticket/17555] Only run unit tests on windows runners