Backport #19033 to 2014.1

Backport #19033 to 2014.1