Merge "Exclude holes from the block map."