Merge "Rework the deploy/undeploy method"