Merge branch 'openapi/reports' into 'develop'