Merge pull request #1775 from atsareg/fix-v6r10

Fix v6r10
v6r10
Conflicts resolved with rel-v6r10