Merge "update the deployment view"