Some random work on images (AMEND THIS COMMIT)

I have to go but I want someone else to be able to pick up where I left off.
Merge branch 'osl/feature/17457-image-entry-form' into feature/17457
Add Image entry