diff --git a/api_docs/changelog.md b/api_docs/changelog.md
index 0f25e7a77b..e70034684d 100644
--- a/api_docs/changelog.md
+++ b/api_docs/changelog.md
@@ -20,6 +20,14 @@ format used by the Zulip server that they are interacting with.
 
 ## Changes in Zulip 11.0
 
+**Feature level 383**
+
+* [`POST /register`](/api/register-queue), [`PATCH
+  /settings`](/api/update-settings), [`PATCH
+  /realm/user_settings_defaults`](/api/update-realm-user-settings-defaults):
+  Added new option in user setting `web_channel_default_view`, to show
+  inbox view style list of topics.
+
 **Feature level 382**
 
 * `POST /message/{message_id}/report`: Added a new endpoint for submitting
diff --git a/api_docs/message-formatting.md b/api_docs/message-formatting.md
index 91ff3af604..e90afa7f2c 100644
--- a/api_docs/message-formatting.md
+++ b/api_docs/message-formatting.md
@@ -113,6 +113,12 @@ In Zulip 10.0 (feature level 319), added Markdown syntax
 for linking to a specific message in a conversation. Declared the
 `data-stream-id` field to be deprecated as detailed above.
 
+In Zulip 11.0 (feature level ZF-93627a), clients can decide what
+channel view a.stream channel link elements take you to -- i.e.,
+the href for those is the default behavior of the link that also
+encodes the channel alongside the data-stream-id field, but clients
+can override that default based on `web_channel_default_view` setting.
+
 ## Image previews
 
 When a Zulip message is sent linking to an uploaded image, Zulip will
diff --git a/version.py b/version.py
index 95199d067d..ead08719ed 100644
--- a/version.py
+++ b/version.py
@@ -34,7 +34,7 @@ DESKTOP_WARNING_VERSION = "5.9.3"
 # new level means in api_docs/changelog.md, as well as "**Changes**"
 # entries in the endpoint's documentation in `zulip.yaml`.
 
-API_FEATURE_LEVEL = 382
+API_FEATURE_LEVEL = 383
 
 # Bump the minor PROVISION_VERSION to indicate that folks should provision
 # only when going from an old version of the code to a newer version. Bump
diff --git a/zerver/models/users.py b/zerver/models/users.py
index e8cadb9ae4..3d673a465e 100644
--- a/zerver/models/users.py
+++ b/zerver/models/users.py
@@ -125,9 +125,11 @@ class UserBaseSettings(models.Model):
 
     WEB_CHANNEL_DEFAULT_VIEW_FIRST_TOPIC = 1
     WEB_CHANNEL_DEFAULT_VIEW_CHANNEL_FEED = 2
+    WEB_CHANNEL_DEFAULT_VIEW_TOPIC_LIST = 3
 
     WEB_CHANNEL_DEFAULT_VIEW_CHOICES = [
         WEB_CHANNEL_DEFAULT_VIEW_FIRST_TOPIC,
+        WEB_CHANNEL_DEFAULT_VIEW_TOPIC_LIST,
         WEB_CHANNEL_DEFAULT_VIEW_CHANNEL_FEED,
     ]
 
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 750a306d71..8eab766fce 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -12617,13 +12617,19 @@ paths:
 
                     - 1 - Top topic in the channel
                     - 2 - Channel feed
+                    - 3 - List of topics
 
-                    **Changes**: New in Zulip 9.0 (feature level 269). Previously, this
+                    **Changes**: The "List of topics" option is new in
+                    Zulip 11.0 (feature level 383).
+
+                    New in Zulip 9.0 (feature level 269). Previously, this
                     was not configurable, and every user had the "Channel feed" behavior.
+
                   type: integer
                   enum:
                     - 1
                     - 2
+                    - 3
                   example: 1
                 web_font_size_px:
                   description: |
@@ -16014,8 +16020,12 @@ paths:
 
                               - 1 - Top topic in the channel
                               - 2 - Channel feed
+                              - 3 - List of topics
 
-                              **Changes**: New in Zulip 9.0 (feature level 269). Previously, this
+                              **Changes**: The "List of topics" option is new in
+                              Zulip 11.0 (feature level 383).
+
+                              New in Zulip 9.0 (feature level 269). Previously, this
                               was not configurable, and every user had the "Channel feed" behavior.
                           starred_message_counts:
                             type: boolean
@@ -18762,8 +18772,12 @@ paths:
 
                               - 1 - Top topic in the channel
                               - 2 - Channel feed
+                              - 3 - List of topics
 
-                              **Changes**: New in Zulip 9.0 (feature level 269). Previously, this
+                              **Changes**: In Zulip 11.0 (feature level 383), we added a new option
+                              "List of topics" to this setting.
+
+                              New in Zulip 9.0 (feature level 269). Previously, this
                               was not configurable, and every user had the "Channel feed" behavior.
                           starred_message_counts:
                             type: boolean
@@ -19909,8 +19923,12 @@ paths:
 
                     - 1 - Top topic in the channel
                     - 2 - Channel feed
+                    - 3 - List of topics
 
-                    **Changes**: New in Zulip 9.0 (feature level 269). Previously, this
+                    **Changes**: The "List of topics" option is new in
+                    Zulip 11.0 (feature level 383).
+
+                    New in Zulip 9.0 (feature level 269). Previously, this
                     was not configurable, and every user had the "Channel feed" behavior.
                   type: integer
                   enum:
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index 7169b95d96..ea3354fe3b 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -4657,7 +4657,7 @@ class UserDisplayActionTest(BaseAction):
             web_home_view=["all_messages", "inbox", "recent_topics"],
             demote_inactive_streams=[2, 3, 1],
             web_mark_read_on_scroll_policy=[2, 3, 1],
-            web_channel_default_view=[2, 1],
+            web_channel_default_view=[2, 1, 3],
             user_list_style=[1, 2, 3],
             web_animate_image_previews=["always", "on_hover", "never"],
             web_stream_unreads_count_display_policy=[1, 2, 3],