Merge "Don't use a TX_SIZE as a TX_TYPE" into nextgenv2