[[ Bug 10980 ]] Setting the filename of an image with an existing filename property causes error in the result.
Merge branch 'bugfix-10980' into develop