Merge "Proper way to ensure process dies before restart it"