Backport #16813 to 2014.7

Backport #16813 to 2014.7