Merge branch 'fix-win-tests-compat' into fix-win-tests