Merge "Deal with new PROCESS_STATE"