Merge "use pgrep instead of ps"