[PATCH OLK-6.6 0/2] OLK-6.6