Backport #16559 to 2014.7

Backport #16559 to 2014.7