Merge "Refactor deploy-config.py"