Merge pull request #4110 from BrzVlad/fix-sgen-win32