am 69608fe7: Merge "Zero blocks before BLKDISCARD"

* commit '69608fe7548727ee765c89f69a6861479f391487':
  Zero blocks before BLKDISCARD