[PATCH OLK-6.6 0/3] fix oenetcls bugs