Backport #16325 to 2014.7

Backport #16325 to 2014.7