Merge branch 'jc/filter-commit'