Merge "Add support for clobbered blocks" into mnc-dev