Merge branch 'hotfix-0.5.0-config'