Bug fix
Merge branch 'hotfix-autoname-service'