Conflicts resolved
v6r8-pre4