DDBNEXT-1015: Avoided the use of the orig path for images in the binary
viewer
Merge branch 'DDBNEXT-1015' into release/4.2