#856, #862
Merge branch 'task-856-organization-service-cover' into staging