DDBEASY 149 - Fixes for default images.
Merge branch 'DDBEASY-149' into develop