HOTFIX: DDBNEXT-1863