Merge "[COMMON] Fix deploy.sh/undeploy.sh scripts"