Backport #14774 to 2014.7

Backport #14774 to 2014.7