Backport #17706 to 2014.7

Backport #17706 to 2014.7