Backport #16385 to 2014.7

Backport #16385 to 2014.7