Fix DDBNEXT-668
Fix error message on DDBNEXT-668
Merge branch 'DDBNEXT-668' into develop