[OE-3301] syncing tweaks