Backport #14845 to 2014.7

Backport #14845 to 2014.7