Merge "Reusing swap_block_ptr() function."