Merge "Deal with a new PROCESS_STATE"