Backport #18163 to 2014.1

Backport #18163 to 2014.1