[OE-5242] autosave validation and fup
[OE-5242] merge