Merge "Preventing zombie process creation." into pi-dev