Merge "Unhide the file API"