[A] GOTCHA !!! (Fix image-related years-old bugs)

[Stephen J. Turnbull]

Didier Verna writes:

 >       But now, I think we're finally ready for a 21.5 release ;-)

Are you volunteering to do it? ;-)