[[ Bug 10977 ]] Setting image filename/text to empty should have no effect if the property is already empty.
Merge branch 'bugfix-10977' into develop