Add some salt
Fix typo
Merge pull request #18967 from rallytime/cp-18296

Backport #18296 to 2014.1