Backport fix for #11151
Merge pull request #13949 from cachedout/2014.1

Backport fix for #11151