Merge "Rename BLOCK_SZ to block_size" into main