Merge "Fix decoder crash with supertx" into nextgenv2