Backport #18163 to 2014.7

Backport #18163 to 2014.7