Merge "Aligning block_buffer to uint32_t"