Merge "A crash fix for supertx / ext-inter combination." into nextgenv2