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

for v6r8 release