Backport #15045 to 2014.7

Backport #15045 to 2014.7