Backport #14715 to 2014.7

Backport #14715 to 2014.7