A private PR to track the work on Windows build