Backport #14607 to 2014.7

Backport #14607 to 2014.7