Merge branch 'resolver_death'