Re: Please apply commit b86e33075ed1 to v4.4.y and v4.9.y