Merge "Add system_file_type"