Merge "fix terminate pnf error"