Backport #15826 to 2014.7

Backport #15826 to 2014.7