more better defaults: addresses use fqdn
Merge branch 'hotfix/1.6.2'