Backport #19116 to 2014.7

Backport #19116 to 2014.7