Backport #14701 to 2014.7

Backport #14701 to 2014.7