Merge branch 'hotfix/fix_view_person'
fix
Merge branch 'hotfix/fix_admin_api_auth' into develop