hotfix DDBNEXT-1447