Backport #19154 to 2014.7

Backport #19154 to 2014.7