Backport #17001 to 2014.1

Backport #17001 to 2014.1