[OE-3987] grammar changes