Merge branch 'ks/blame-worktree-textconv-cached' into maint