Merge branch 'jk/set-upstream-error-cases'