Merge "Change supertx syntax order." into nextgenv2