Backport #18147 to 2014.1

Backport #18147 to 2014.1