Merge "Fix msvc compiler warnings" into nextgenv2