Backport #16311 to 2014.7

Backport #16311 to 2014.7