Merge branch 'cb/fetch-set-upstream'