Merge "Add Controller scale param to merge.py"