Merge 'grep-fixes' into HEAD