HOTFIX: DDBNEXT-1932