[OE-3301] optimised sync