[case 9869] Fixed serialization issues