Merge "Don't error on block size mismatches."