Merge branch 'rs/grep-h-c'