Merge "Alternate reference frame" into nextgenv2