Merge pull request #9264 from afedchin/win32_fixes_j