the image is optional now
Merge branch 'bugid-68505' into dev