HOTFIX for DDBNEXT-1463