Conflicts
Conflicts resolved
Merge branch 'rel-v6r12' into integration