Merge branch 'DDBNEXT-1026' into release/4.2
DDB-NEXT-1015: viewer preview fallbacks
Merge branch 'DDBNEXT-1015_fallback' into develop