Merge branch 'admin-fix-duplicated-endpoints' into 'develop'