Merge branch 'tidy-config'