[OE-2540] updates