Backport #18272 to 2014.1

Backport #18272 to 2014.1