Backport #18706 to 2014.7

Backport #18706 to 2014.7