Merge branch 'tr/doc-git-cherry' into maint