Backport #18332 to 2014.1

Backport #18332 to 2014.1