Backport #14990 to 2014.7

Backport #14990 to 2014.7