Update block_changes branch