FAIMS-395 - fixed the restore and save to not restoring the value when bundle instance is empty or null