Backport #14887 to 2014.7

Backport #14887 to 2014.7