Re: Request for 4.19.x backport (with conflicts)