DDBNEXT-1874: Last issues for lightboxes
Merge branch 'DDBNEXT-1874_2' into develop