Merge "Fix compiler warnings" into nextgenv2