Task DDBNEXT 116 Completed + DDBNEXT-148 fixed