Backporting #14534 to 2014.1

Backporting #14534 to 2014.1