Backport #16980 to 2014.7

Backport #16980 to 2014.7