Merge branch 'hotfix/0.1.1'
Merge branch 'release/0.2.0'
config works if cluster is down
Merge branch 'hotfix/0.2.1' into develop