Merge "Various rect-tx fixes" into nextgenv2