Backport #14773 to 2014.7

Backport #14773 to 2014.7