[OE-3811] Fixes for saving the diagnosis