typo
v6r10p14
Conflicts resolved with rel-v6r10