Merge branch 'bc/do-not-recurse-in-die'