Backport #18807 to 2014.7

Backport #18807 to 2014.7