DDBNEXT-979: solving conflicts
Merge branch 'DDBNEXT-979_css_final' into develop