Merge branch 'hotfix-0.9.14'
config fix
Merge branch 'hotfix-0.9.15' into develop