Backport #16932 to 2014.7

Backport #16932 to 2014.7