Fixed aggregator changes
Merge branch 'admin_role_use_cases' into develop