Merge "Change to use local variables consistently" into nextgenv2