From 8150ee2484dabed61718ef43d5c98cdd2c0fa01c Mon Sep 17 00:00:00 2001
From: Shadowghost <Shadowghost@users.noreply.github.com>
Date: Tue, 15 Sep 2026 11:13:48 -0400
Subject: Backport pull request #17842 from jellyfin/release-12.z

Fix versions of a video still listing separately from their group and preserve manual merges

Original-merge: cabec7ec28df671e3bb1c360c32db60b085f4084

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>
---
 MediaBrowser.Controller/Entities/InternalItemsQuery.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'MediaBrowser.Controller/Entities/InternalItemsQuery.cs')

diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index eb2a3676ac..7c88d5dd05 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -488,6 +488,14 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         public bool IncludeOwnedItems { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to include alternate versions, which carry a
+        /// <see cref="Video.PrimaryVersionId"/> and are normally hidden behind the version they
+        /// belong to. Unlike <see cref="IncludeOwnedItems"/> this keeps the versions a user merged
+        /// by hand without also returning the parts and extras owned by another item.
+        /// </summary>
+        public bool IncludeAlternateVersions { get; set; }
+
         public bool? Is4K { get; set; }
 
         public int? MaxHeight { get; set; }
-- 
cgit v1.2.3