[v6r12] Bug fixes