Backport #15617 to 2014.7

Backport #15617 to 2014.7