config fix
Merge branch 'hotfix-0.9.15'