Backport #15340 to 2014.7

Backport #15340 to 2014.7