Backport #17172 to 2014.7

Backport #17172 to 2014.7