changes with new mockup DDBNEXT-1573
Merge branch 'DDBNEXT-1573c-ugo' into develop