Re: [PATCH OLK-6.6 0/2] Port patches from OLK-5.10