Merge branch 'boomerang-death'