Backport #18915 to 2014.7

Backport #18915 to 2014.7