[OE-4203] Latest eyedraw integration