Backport #17188 to 2014.7

Backport #17188 to 2014.7