Merge branch 'cleanup/admin-api-useless-if' into 'develop'