Merge branch 'vendor/GREP'