Backport #18190 to 2014.1

Backport #18190 to 2014.1