[OE-3301] optimisation