Backport #14772 to 2014.7

Backport #14772 to 2014.7