Merge "Adding more robust file deletion"