Merge branch 'tr/doc-git-cherry'