fix #7605 - revamp_image_managment_code