Backport #14656 to 2014.7

Backport #14656 to 2014.7