DDBNEXT-733 and DDBNEXT-732