Merge branch 'tz/branch-doc-remove-set-upstream'