Merge branch 'release/1.0.0'
Merge branch 'release/1.1.0'
Remove options that are resolved from the dns
Merge branch 'hotfix/1.1.1' into develop