Updated file_entity
Updated term_merge