Merge branch 'hotfix/errorfix2'
Merge branch 'release/del-and-redeploy'
error fix kill task
Merge branch 'hotfix/fix140402' into develop