Merge "Fix instrument ignoring extra arguments"