Merge "Merge tx selection into RD calculation"