PLA-793 handling images wrapped by divs
Merge remote-tracking branch 'origin/PLA-793' into PLA-793