Merge "Rework the tx type speed feature" into nextgenv2