Backport #15060 to 2014.7

Backport #15060 to 2014.7