Merge "Drop pid field as Pid is preferred"