Backport #16501 to 2014.7

Backport #16501 to 2014.7