Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'