Merge branch 'hotfix/hotfix'
Administrator filters
Merge branch 'hotfix/admin_view_all' into develop