Merging r37048, r37051, r37052, r37055 from the-real-msvc branch