Merge branch 'jc/clean-config'