Merge branch 'fk/threaded-grep'