[[ Bug 11684 ]] Nil pointer crash if prepare image called on non-existent image file
Merge remote-tracking branch 'origin/bugfix-11684' into release-6.5.2

Conflicts:
	docs/notes/bugfix-11684.md