Hotfix DDBNEXT-388