add config comment
Merge branch 'develop'