Merge branch 'jn/maint-pull-rebase-error-message' into maint