Backport #16798 to 2014.7

Backport #16798 to 2014.7