[OE-5242] auto save