Merge "Refactor tx_type reader" into nextgenv2