Backport #14601 to 2014.7

Backport #14601 to 2014.7