Fixed bad merging
Merge branch 'rel-v6r8' into integration