Merge "Fix for compile error with RECT_TX without EXT_TX" into nextgenv2