HOTFIX for DDBNEXT-1542