Backport #15148 to 2014.7

Backport #15148 to 2014.7