Merge "Speed-up in tx_size search" into nextgenv2