Merge "Improvement: delete stack if create stack failed"