[v6r10] Bunch of fixes for v6r10 - number 6