Merge "Fix spurious undead process warning"