Merge branch 'feature/admin-api-reports' into 'develop'