HOTFIX: Bug in DDBNEXT-1842