Issue #2496867 by Berdir, swentel, alexpott, rodrigoaguilera, yobottehg,...

Issue #2496867 by Berdir, swentel, alexpott, rodrigoaguilera, yobottehg, trebormc: Translatable image file is not working unless you also config the image field. Config can get lost anyway

(cherry picked from commit e6ce24be)