Merge "Revert "Zero blocks before BLKDISCARD""