[OE-3514] previous operation final touches