Backport #15516 to 2014.7

Backport #15516 to 2014.7