Backport #14552 to 2014.7

Backport #14552 to 2014.7