diff --git a/ts/components/SendStoryModal.stories.tsx b/ts/components/SendStoryModal.stories.tsx
index 5c62f19412..dd87801a79 100644
--- a/ts/components/SendStoryModal.stories.tsx
+++ b/ts/components/SendStoryModal.stories.tsx
@@ -62,9 +62,13 @@ export default {
     onDeleteList: { action: true },
     onDistributionListCreated: { action: true },
     onHideMyStoriesFrom: { action: true },
+    onMediaPlaybackStart: { action: true },
     onSend: { action: true },
     onViewersUpdated: { action: true },
     setMyStoriesToAllSignalConnections: { action: true },
+    mostRecentActiveStoryTimestampByGroupOrDistributionList: {
+      defaultValue: {},
+    },
     signalConnections: {
       defaultValue: Array.from(Array(42), getDefaultConversation),
     },
diff --git a/ts/util/isInSystemContacts.ts b/ts/util/isInSystemContacts.ts
index 35a5b7932f..ea8dba3c3a 100644
--- a/ts/util/isInSystemContacts.ts
+++ b/ts/util/isInSystemContacts.ts
@@ -4,9 +4,16 @@
 export const isInSystemContacts = ({
   type,
   name,
+  systemGivenName,
+  systemFamilyName,
 }: Readonly<{
   type?: string;
   name?: string;
+  systemGivenName?: string;
+  systemFamilyName?: string;
 }>): boolean =>
   // `direct` for redux, `private` for models and the database
-  (type === 'direct' || type === 'private') && typeof name === 'string';
+  (type === 'direct' || type === 'private') &&
+  (typeof name === 'string' ||
+    typeof systemGivenName === 'string' ||
+    typeof systemFamilyName === 'string');
diff --git a/ts/windows/main/phase1-ipc.ts b/ts/windows/main/phase1-ipc.ts
index 37c7fc6e89..348ded0026 100644
--- a/ts/windows/main/phase1-ipc.ts
+++ b/ts/windows/main/phase1-ipc.ts
@@ -7,11 +7,13 @@ import { mapValues } from 'lodash';
 
 import type { IPCType } from '../../window.d';
 import { parseIntWithFallback } from '../../util/parseIntWithFallback';
+import { getSignalConnections } from '../../util/getSignalConnections';
 import { UUIDKind } from '../../types/UUID';
 import { ThemeType } from '../../types/Util';
 import { getEnvironment, Environment } from '../../environment';
 import { SignalContext } from '../context';
 import * as log from '../../logging/log';
+import { formatCountForLogging } from '../../logging/formatCountForLogging';
 import * as Errors from '../../types/errors';
 
 import { strictAssert } from '../../util/assert';
@@ -202,7 +204,12 @@ ipc.on('additional-log-data-request', async event => {
       const valueString = value && value !== 'TRUE' ? ` ${value}` : '';
       return `${enableString}${valueString}`;
     }),
-    statistics,
+    statistics: {
+      ...statistics,
+      signalConnectionCount: formatCountForLogging(
+        getSignalConnections().length
+      ),
+    },
     user: {
       deviceId: window.textsecure.storage.user.getDeviceId(),
       e164: window.textsecure.storage.user.getNumber(),