#856
Merge branch 'task-856-organization-service-cover'