Merge branch 'jc/pickaxe-grep' into next