Merge branch 'jc/grep-header-all-match-fix' into next