Merge branch 'fix/reports-from-admins' into 'develop'