Backport #19079 to 2014.7

Backport #19079 to 2014.7