Merge "Remove duplicate code" into nextgenv2