Backport #15206 to 2014.7

Backport #15206 to 2014.7