Backport #17243 to 2014.1

Backport #17243 to 2014.1