Merge branch 'js/filter' into ei/worktree+filter