Merge "Fix incorrect merge of forward txfm function declarations" into nextgenv2