Merge branch 'rr/die-on-missing-upstream' into maint