COMMONS-369 fix the usage of OrganizationService in Commons