small changes
Merge branch 'DDBCOMMON-11-ugo' into develop