[ddbnext-29] bugfix for [ddbnext-8]
[ddbnext-29] fix for [ddbnext-8]
Merge branch 'develop' into bugfix/ddbnext-29
Merge remote-tracking branch 'origin/bugfix/ddbnext-29' into develop