PLF-5407 : CLONE - Improve performances by not using OrganizationService