Merge "Fix ps <process name>"