Merge branch 'jk/maint-diff-grep-textconv' into maint