Modify simplification code to simplify re-worked image block, and cope with images annotation
Merge branch 'mbst-3790-prototype-images-node' into stage