Merge branch 'nd/branch-error-cases' into next