Merge "A fix for a missing tx_type" into nextgenv2