Merge branch 'bdb_dev' into bdb_dev

FreeAPS/Sources/Services/HealthKit/HealthKitManager.swift

@@ -199,8 +199,8 @@ final class BaseHealthKitManager: HealthKitManager, Injectable, CarbsObserver {
                         start: $0.createdAt,
                         end: $0.createdAt,
                         metadata: [
-                            HKMetadataKeyExternalUUID: $0.id!.uuidString,
-                            HKMetadataKeySyncIdentifier: $0.id!.uuidString,
+                            HKMetadataKeyExternalUUID: $0.id?.uuidString ?? "_id",
+                            HKMetadataKeySyncIdentifier: $0.id?.uuidString ?? "_id",
                             HKMetadataKeySyncVersion: 1,
                             Config.freeAPSMetaKey: true
                         ]