Merge "Add argument types for deploy.py"