Merge "Avoid calling Block::deleteIfExpired() when not needed"