changes with new mockup DDBNEXT-1573