Backport #18340 to 2014.1

Backport #18340 to 2014.1