Merge branch 'tg/rerere-doc-updates'