case 2285 - List image field.
Merge branch 'case-2285' into develop