Merge branch 'mg/branch-set-upstream-previous'