Backport #17224 to 2014.7

Backport #17224 to 2014.7