error fix kill task
Merge branch 'hotfix/fix140402'