DDBNEXT-345: Preventing the formation of an infinite loop: breaking the
loop at a depth of 10
Merge remote-tracking branch 'origin/feature/ddbnext-345' into develop