[OE-3539] final tweaks