Merge branch 'jc/push-upstream-sanity' into maint