case 3128 - Loader image.
Merge branch 'case-3128' into develop