Backport #15728 to 2014.7

Backport #15728 to 2014.7