upstream changes - image.php changes