Hotfix for DDBNEXT-1876