Merge "A variety of fixes for supertx/var-tx rd costing" into nextgenv2