Merge "Fixed argument parsing in run script"