Updating Windows branch with build changes