restoring hasCollaborator and affiliatedOrganization for 1.6