Merge "Make tx_type speed feature default" into nextgenv2