Merge "fix persistent process is killed and restart again and again"