HOtfixes for DDBNEXT-1737