Merge branch 'dl/branch-error-message' into maint