Merge branch 'jc/ref-excludes'