Backport #15073 to 2014.7

Backport #15073 to 2014.7