Re: Please apply commits f0f1b8cac4d8 and 7fafcfdf6377 to v4.4.y