Merge branch 'jk/config-include'