Merge branch 'jk/sh-setup-in-filter-branch'