[PATCH OLK-6.6 0/7] merge HULK-6.6 patches into OLK-6.6