Merge "update_state_supertx: rename a shadowed variable" into nextgenv2