OZP-836: Add report gateways to services and controllers
Merge branch 'master' into feature/ozp-836-create-report-service