Backport #16572 to 2014.7

Backport #16572 to 2014.7