Backport #15775 to 2014.7

Backport #15775 to 2014.7