Merge branch 'jc/exclusion-doc'