bug fix
Merge branch 'rel-v6r10' into integration