Backport #15768 to 2014.7

Backport #15768 to 2014.7