Merge "Add support for clobbered blocks"