Backport #15919 to 2014.7

Backport #15919 to 2014.7