Backport #16420 to 2014.7

Backport #16420 to 2014.7