Backport #18237 to 2014.1

Backport #18237 to 2014.1