Backport #15276 to 2014.7

Backport #15276 to 2014.7