Merge branch 'jc/apply-include-exclude'