Merge branch 'fix/admin-api-user-deletion' into 'develop'