Merge branch 'jc/grep-c' into maint