release branch for combinator 2.0
Merge branch 'develop'
include config dir