Backport #16252 to 2014.7

Backport #16252 to 2014.7