Merge "Using max_tx_size instead of bsize when possible."