[OE-3684] Edit session