Merge "Updating ci deploy script + argument parsing improvements"