DDBNEXT-1301: Limit entity teasers to two
Merge branch 'DDBNEXT-1301-BOZ' into develop