Merge "Fix Visual Studio build warnings" into nextgenv2