Merge "Switch order of gm parameters for affine model" into nextgenv2