Merge branch 'admin-api-users-sort' into 'develop'