Backport #18079 to 2014.7

Backport #18079 to 2014.7