Backport #17183 to 2014.7

Backport #17183 to 2014.7