Merge "Fsync directories before delete key"