Merge Razvan's process management code.