Merge "Align frame contexts." into nextgenv2