Merge "Add utility to prepare files in a similar way to directories" into nyc-dev