HOTFIX: DDBNEXT-1880