DDBNEXT-1435: revise lightbox
Merge branch 'DDBNEXT-1435' into develop