Merge "Remove Persistent proccess without WTFing" into pi-dev