Backport #19121 to 2014.7

Backport #19121 to 2014.7