Only delete files that are no longer needed when saving persistent storage; try to avoid getting handles in and writing to directories marked for deletion.
Merge branch 'origin/master'