Added patch for file_entity and applied