Merge branch 'jc/post-simplify' into tr/filter-branch