Backport #15877 to 2014.7

Backport #15877 to 2014.7