DDBNEXT-978: bg images refactored
DDBNEXT-978: Refactoring Images
Merge branch 'DDBNEXT-978-refactoring_images' into develop