merged DDBNEXT-130 and 131