Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'