BUGFIXES
Merge pull request #1736 from ubeda/v6r10_bugfixes

v6r10 : BUGFIXES
v6r10-pre17
Conflicts resolved with rel-v6r10
v6r10-pre17