Merge "Handle DEAD_OBJECT correctly in H2BGBP"