Merge "Fix obsolete argument name"