Backport #19051 to 2014.7

Backport #19051 to 2014.7