HOTFIX for DDBNEXT-1455