Merge branch 'admin-api-user-show' into 'develop'