Backport #16613 to 2014.7

Backport #16613 to 2014.7