Write less unmidified blocks to disk
Merge remote-tracking branch 'upstream/master' into lock