Merge "fix windows build"