Merge branch 'jk/grep-binary-workaround-in-test' into maint