Backport #15466 to 2014.7

Backport #15466 to 2014.7