Backport #18105 to 2014.7

Backport #18105 to 2014.7