logging
fixes
Fix test
Merge pull request #1940 from fstagni/v6r11-minorFixes

[v6r11] Minor fixes