Backport #14861 to 2014.7

Backport #14861 to 2014.7