Backport #15619 to 2014.7

Backport #15619 to 2014.7