Backport #15967 to 2014.7

Backport #15967 to 2014.7