DDBNEXT-1569: Design of similar objects
Merge branch 'DDBNEXT-1569-BOZ' into develop