Remove options that are resolved from the dns
Merge branch 'hotfix/1.1.1'