Merge "Relocate supertx prob update" into nextgenv2