[PATCH OLK-6.6 0/1]