Merge "Ensure dumpstate children die"