Merge branch 'jk/config-path-include-fix'