[OE-3856] changes following devteam discussion