#28203 METHOD - Polish loading of images

@prabinv , @texasag and @hippee-lee Please code review