Layout changes for similar objects
Merge branch 'DDBNEXT-1340-BOZ-v2' into develop