Merge "Rework deploy/undeploy UI"