Merge "Tweak encoding flags for supertx." into nextgenv2