Merge "Passing TXFM_TYPE instead of func pointer" into nextgenv2