fix args
Merge pull request #18827 from rallytime/cp-18332

Backport #18332 to 2014.1