Backport #14694 to 2014.7

Backport #14694 to 2014.7