Merge "Correction of the auto-kill during deploy"