Backport #16809 to 2014.7

Backport #16809 to 2014.7