[FIX] Just a number of fixes ported from integration to v6r7 

for v6r8 release
Merge pull request #1385 from fstagni/portingsFromIntegration

[FIX] Just a number of fixes ported from integration to v6r7