ENG-6129 First clean Windows build