[v6r11] Bunch of fixes for v6r11