Backport #15089 to 2014.7

Backport #15089 to 2014.7