Merge branch '3.3.x'
Merge pull request #6863 from marc1706/ticket/17555 [ticket/17555] Adapt windows runner tests to prevent random failures