Backport #19014 to 2014.7

Backport #19014 to 2014.7