BUGFIXES
Merge pull request #1736 from ubeda/v6r10_bugfixes

v6r10 : BUGFIXES