HOTFIX: DDBNEXT-1880_2