Backport #18213 to 2014.7

Backport #18213 to 2014.7