Request for backport 35a2897c2a to 4.9 branch