Merge "Correction to costing rect_tx" into nextgenv2