Backport #18275 to 2014.1

Backport #18275 to 2014.1