Merge branch 'ab/perf-grep-threads' into maint