Backport #14882 to 2014.7

Backport #14882 to 2014.7