Backport #15464 to 2014.7

Backport #15464 to 2014.7