Please apply commit 821cdad5c46c to v4.9.y