Merge pull request #4828 from BrzVlad/fix-windows-ci