[REF] backport of c1b1ba6945

[IMP] website: image controller can use xmlid
Merge the master version of this controller with the v8 one