[OE-4203] New eyedraw integration work