[OE-3301] sync bugfixes