Backport #15409 to 2014.7

Backport #15409 to 2014.7