Backport #14851 to 2014.7

Backport #14851 to 2014.7