Merge branch 'features/admin-api-user-views' into 'develop'