Merge branch 'ks/branch-set-upstream'