HOTFIX: Fix issue DDBNEXT-1789