Several changes
Some cleaning
Merge branch 'DDBCOMMON-6-ugo' into develop