Merge branch 'ls/clean-smudge-override-in-config'