Merge "Delete directory creation"