Merge "Fix bug in undeploy flow"