Merge "Change to use correct variable in for-loop" into nextgenv2