Backport #17231 to 2014.7

Backport #17231 to 2014.7