Backport #18776 to 2014.1

Backport #18776 to 2014.1