Merge "minor format fix" into nextgenv2