Merge "Deprecate FILE_NAME_TAG"