[PATCH OLK-5.10 0/2] CVE merge OLK-5.10