Merge "Fix for lossless with rect-tx" into nextgenv2