Merge "change to use correct type" into nextgenv2