Merge branch 'tm/completion-push-set-upstream'