Merge "update the deployment view of the SO"