Backport #16452 to 2014.7

Backport #16452 to 2014.7