Backport #14700 to 2014.7

Backport #14700 to 2014.7