Backport #15410 to 2014.7

Backport #15410 to 2014.7