Merge branch 'rs/threaded-grep-context'