[PATCH OLK-5.10 0/2] Push 2 self-developed patches to OLK-5.10