Merge branch 'jh/clean-exclude'