Backport #18712 to 2014.7

Backport #18712 to 2014.7