[v6r12] Bunch of fixes for v6r12 - 2