Backport #15165 to 2014.7

Backport #15165 to 2014.7