Backport #19134 to 2014.7

Backport #19134 to 2014.7