HOTFIX for DDBNEXT-1730