Merge "Fix Visual Studio build." into nextgenv2