Merge branch 'ef/maint-rebase-error-message'