HOTFIX for DDBNEXT-1789