Re: [PATCH OLK-5.10 0/2] Sync two patches to olk