Merge "Reactivate image before deletion"