Merge "Fix msvc compling" into nextgenv2