[v6r11] Various minor fixes

Plus few portings from integration