-UndoWriteToDisk -WriteBlockToDisk
It also contains a commit from #5669 (to avoid the later rebase conflict if that gets merged sooner).
ut ACK 260f5c94a7c262ea43d0e1d779e0ff20be36c954
utACK (and needs rebase)
-UndoWriteToDisk
-WriteBlockToDisk
Rebased (confused about why github required the rebase, it was a clean rebase).