Merge branch 'main' into 19615-static-s3

2026-01-23 03:58:45 -06:00 · 2025-10-09 09:54:42 -07:00
parent 06651462c7 7719b98697
commit e5174bb723
98 changed files with 4294 additions and 3446 deletions
--- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml
@@ -15,7 +15,7 @@ body:
    attributes:
      label: NetBox version
      description: What version of NetBox are you currently running?
-      placeholder: v4.4.1
+      placeholder: v4.4.2
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml
@@ -27,7 +27,7 @@ body:
    attributes:
      label: NetBox Version
      description: What version of NetBox are you currently running?
-      placeholder: v4.4.1
+      placeholder: v4.4.2
    validations:
      required: true
  - type: dropdown
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,3 +1,11 @@
 paths-ignore:
  # Ignore compiled JS
  - netbox/project-static/dist
+
+query-filters:
+  # Exclude py/url-redirection: NetBox uses safe_for_redirect() wrapper function
+  # which validates all redirects via Django's url_has_allowed_host_and_scheme().
+  # CodeQL's taint tracking doesn't recognize wrapper functions without custom
+  # query configuration. See #20484.
+  - exclude:
+      id: py/url-redirection
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -30,7 +30,8 @@ django-htmx

 # Modified Preorder Tree Traversal (recursive nesting of objects)
 # https://github.com/django-mptt/django-mptt/blob/main/CHANGELOG.rst
-django-mptt
+# v0.18.0 introduces errant migrations which need to be resolved
+django-mptt==0.17.0

 # Context managers for PostgreSQL advisory locks
 # https://github.com/Xof/django-pglocks/blob/master/CHANGES.txt
--- a/contrib/generated_schema.json
+++ b/contrib/generated_schema.json
@@ -332,14 +332,14 @@
                        "100base-t1",
                        "1000base-bx10-d",
                        "1000base-bx10-u",
-                        "1000base-cx",
                        "1000base-cwdm",
+                        "1000base-cx",
                        "1000base-dwdm",
                        "1000base-ex",
-                        "1000base-sx",
                        "1000base-lsx",
                        "1000base-lx",
                        "1000base-lx10",
+                        "1000base-sx",
                        "1000base-t",
                        "1000base-tx",
                        "1000base-zx",
@@ -374,6 +374,7 @@
                        "100gbase-cr2",
                        "100gbase-cr4",
                        "100gbase-cr10",
+                        "100gbase-cwdm4",
                        "100gbase-dr",
                        "100gbase-er4",
                        "100gbase-fr1",
@@ -387,12 +388,12 @@
                        "100gbase-zr",
                        "200gbase-cr2",
                        "200gbase-cr4",
-                        "200gbase-sr2",
-                        "200gbase-sr4",
                        "200gbase-dr4",
                        "200gbase-er4",
                        "200gbase-fr4",
                        "200gbase-lr4",
+                        "200gbase-sr2",
+                        "200gbase-sr4",
                        "200gbase-vr2",
                        "400gbase-cr4",
                        "400gbase-dr4",
@@ -415,34 +416,34 @@
                        "1000base-x-gbic",
                        "1000base-x-sfp",
                        "10gbase-x-sfpp",
-                        "10gbase-x-xfp",
                        "10gbase-x-xenpak",
+                        "10gbase-x-xfp",
                        "10gbase-x-x2",
                        "25gbase-x-sfp28",
-                        "50gbase-x-sfp56",
                        "40gbase-x-qsfpp",
                        "50gbase-x-sfp28",
+                        "50gbase-x-sfp56",
                        "100gbase-x-cfp",
                        "100gbase-x-cfp2",
-                        "200gbase-x-cfp2",
-                        "400gbase-x-cfp2",
                        "100gbase-x-cfp4",
                        "100gbase-x-cxp",
                        "100gbase-x-cpak",
                        "100gbase-x-dsfp",
-                        "100gbase-x-sfpdd",
                        "100gbase-x-qsfp28",
                        "100gbase-x-qsfpdd",
+                        "100gbase-x-sfpdd",
+                        "200gbase-x-cfp2",
                        "200gbase-x-qsfp56",
                        "200gbase-x-qsfpdd",
                        "400gbase-x-qsfp112",
                        "400gbase-x-qsfpdd",
+                        "400gbase-x-cdfp",
+                        "400gbase-x-cfp2",
+                        "400gbase-x-cfp8",
                        "400gbase-x-osfp",
                        "400gbase-x-osfp-rhs",
-                        "400gbase-x-cdfp",
-                        "400gbase-x-cfp8",
-                        "800gbase-x-qsfpdd",
                        "800gbase-x-osfp",
+                        "800gbase-x-qsfpdd",
                        "1000base-kx",
                        "2.5gbase-kx",
                        "5gbase-kr",
--- a/contrib/openapi.json
+++ b/contrib/openapi.json
--- a/docs/best-practices/performance-handbook.md
+++ b/docs/best-practices/performance-handbook.md
@@ -141,17 +141,39 @@ Complex API requests, which pull in many related objects, generate a relatively

 NetBox's read-only [GraphQL API](../integrations/graphql-api.md) offers an alternative to its REST API, and provides a very flexible means of retrieving data. GraphQL enables the client to request any object from a single endpoint, specifying only the desired attributes and relations. Many users prefer this to the more rigid structure of the REST API, but it's important to understand the trade-offs of crafting complex queries.

+#### Request Only the Necessary Fields
+
+For optimal performance, craft your GraphQL queries to return only the fields needed by the client. This will reduce the overall query time, especially when omitting related objects.
+
 #### Avoid Overly Complex Queries

 The primary benefit of the GraphQL API is that it allows the client to offload to the server the work of stitching together various related objects, which would require the client to make multiple requests to different endpoints if using the REST API. However, this advantage does not come for free: The more information that is requested in a single query, the more work the server needs to do to fetch the raw data from the database and render it into a GraphQL response. Very complex queries can yield dozens or hundreds of SQL queries on the backend, which increase the time it takes to render a response.

 While it can be tempting to pack as much data as possible into a single GraphQL query, realize that there is a balance to be struck between minimizing the number of queries needed and avoiding complexity in the interest of performance. For example, while it is possible to retrieve via a single GraphQL API request all the IP addresses and all attached cables for every device in a site, it is probably more efficient (often _much_ more efficient) to make two or three separate requests and correlate the data locally.

+#### Use Filters
+
+You can specify filters when making a GraphQL query to limit the set of objects returned. This works a bit differently from the REST API, as filters are declared inside the query statement rather than appended to the URL, but the concept is the same. For example, to return only active sites:
+
+```graphql
+query {
+  site_list(
+    filters: {
+      status: STATUS_ACTIVE
+    }
+  ) {
+    name
+  }
+}
+```
+
+This returns only sites with a status of "active" and avoid needing to parse through all the others. For further information about filters, see the [GraphQL API documentation](../integrations/graphql-api.md).
+
 #### Employ Pagination

 Like the REST API, the GraphQL API supports pagination. Queries which return a large number of objects should employ pagination to limit the size of each response.

-```
+```graphql
 {
  device_list(
    pagination: {limit: 100}
--- a/docs/configuration/default-values.md
+++ b/docs/configuration/default-values.md
@@ -4,7 +4,7 @@

 This parameter controls the content and layout of user's default dashboard. Once the dashboard has been created, the user is free to customize it as they please by adding, removing, and reconfiguring widgets.

-This parameter must specify an iterable of dictionaries, each representing a discrete dashboard widget and its configuration. The follow widget attributes are supported:
+This parameter must specify an iterable of dictionaries, each representing a discrete dashboard widget and its configuration. The following widget attributes are supported:

 * `widget`: Dotted path to the Python class (required)
 * `width`: Default widget width (between 1 and 12, inclusive)
@@ -63,6 +63,8 @@ DEFAULT_USER_PREFERENCES = {

 For a complete list of available preferences, log into NetBox and navigate to `/user/preferences/`. A period in a preference name indicates a level of nesting in the JSON data. The example above maps to `pagination.per_page`.

+See also: [Clearing table preferences](../features/user-preferences.md#clearing-table-preferences) for resolving errors caused by saved table columns or ordering.
+
 ---

 ## PAGINATE_COUNT
--- a/docs/development/user-preferences.md
+++ b/docs/development/user-preferences.md
@@ -2,6 +2,8 @@

 The `users.UserConfig` model holds individual preferences for each user in the form of JSON data. This page serves as a manifest of all recognized user preferences in NetBox.

+For end‑user guidance on resetting saved table layouts, see [Features > User Preferences](../features/user-preferences.md#clearing-table-preferences).
+
 ## Available Preferences

 | Name                     | Description                                                   |
--- a/docs/features/customization.md
+++ b/docs/features/customization.md
@@ -2,6 +2,8 @@

 While NetBox strives to meet the needs of every network, the needs of users to cater to their own unique environments cannot be ignored. NetBox was built with this in mind, and can be customized in many ways to better suit your particular needs.

+For end‑user personalization topics (bookmarks, table preferences, language, CSV delimiter, and more), see [Features > User Preferences](../features/user-preferences.md).
+
 ## Tags

 Most objects in NetBox can be assigned user-created tags to aid with organization and filtering. Tag values are completely arbitrary: They may be used to store data in key-value pairs, or they may be employed simply as labels against which objects can be filtered. Each tag can also be assigned a color for quicker differentiation in the user interface.
@@ -18,10 +20,6 @@ The `tag` filter can be specified multiple times to match only objects which hav
 GET /api/dcim/devices/?tag=monitored&tag=deprecated
 ```

-## Bookmarks
-
-Users can bookmark their most commonly visited objects for convenient access. Bookmarks are listed under a user's profile, and can be displayed with custom filtering and ordering on the user's personal dashboard.
-
 ## Custom Fields

 While NetBox provides a rather extensive data model out of the box, the need may arise to store certain additional data associated with NetBox objects. For example, you might need to record the invoice ID alongside an installed device, or record an approving authority when creating a new IP prefix. NetBox administrators can create custom fields on built-in objects to meet these needs.
@@ -38,7 +36,7 @@ Custom links allow you to conveniently reference external resources related to N
 http://server.local/vms/?name={{ object.name }}
 ```

-Now, when viewing a virtual machine in NetBox, a user will see a handy button with the chosen title and link (complete with the name of the VM being viewed). Both the text and URL of custom links can be templatized in this manner, and custom links can be grouped together into dropdowns for more efficient display.
+Now, when viewing a virtual machine in NetBox, a user will see a handy button with the chosen title and link (complete with the name of the VM being viewed). Both the text and URL of custom links can be templatized in this manner, and custom links can be grouped together into dropdowns for a more efficient display.

 To learn more about this feature, check out the [custom link documentation](../customization/custom-links.md).

--- a/docs/features/user-preferences.md
+++ b/docs/features/user-preferences.md
@@ -0,0 +1,63 @@
+# User Preferences
+
+NetBox stores per‑user options that control aspects of the web interface and data display. Preferences persist across sessions and can be managed under **User → Preferences**.
+
+## Table configurations
+
+When a list view is configured using **Configure**, NetBox records the selected columns and ordering as per‑user table preferences for that table. These preferences are applied automatically on subsequent visits.
+
+### Clearing table preferences
+
+Saved table preferences may need to be reset, for example, if a table fails to render or after an upgrade that changes available columns.
+
+To clear saved preferences for one or more tables:
+
+1. Click the username in the top‑right corner.
+2. Select **Preferences** from the dropdown.
+3. Scroll to the **Table Configurations** section.
+4. Select the tables to reset.
+5. Click **Submit** to clear the selected preferences.
+
+After clearing preferences, reopen the list view and use **Configure** to set the desired columns and ordering.
+
+!!! note
+    Per‑user table preferences are distinct from **Table Configs**, which are named, reusable configurations managed under *Customization → Table Configs*. Clearing preferences does not delete any Table Configs. See [Table Configs](../models/extras/tableconfig.md) for details.
+
+## Other preferences
+
+### Language
+Selects the user interface language from installed translations (subject to system configuration).
+
+### Page length
+Sets the default number of rows displayed on paginated tables.
+
+### Paginator placement
+Controls where pagination controls are rendered relative to a table.
+
+### HTMX navigation (experimental)
+Enables partial‑page navigation for supported views. Disable this preference if unexpected behavior is observed.
+
+### Striped table rows
+Toggles alternating row backgrounds on tables.
+
+### Data format (raw views)
+Sets the default format (JSON or YAML) when rendering raw data blocks.
+
+### CSV delimiter
+Overrides the delimiter used when exporting CSV data.
+
+## Bookmarks
+
+Users can bookmark frequently visited objects for convenient access. Bookmarks appear under the user menu and can be displayed on the personal dashboard using the bookmarks' widget. See [Bookmark](../models/extras/bookmark.md) for model details.
+
+## Notifications and subscriptions
+
+Users may subscribe to objects to receive notifications when changes occur. Notifications are listed under the user menu and can be marked as read or deleted. See [Features > Notifications](notifications.md) and the data‑model references for [Subscription](../models/extras/subscription.md) and [Notification](../models/extras/notification.md).
+
+## Admin defaults
+
+Administrators can define defaults for new users via [`DEFAULT_USER_PREFERENCES`](../configuration/default-values.md#default_user_preferences). Users may override these values under their own preferences.
+
+## See also
+
+- [Development > User Preferences](../development/user-preferences.md) (manifest of recognized preference keys)
--- a/docs/models/extras/tableconfig.md
+++ b/docs/models/extras/tableconfig.md
@@ -4,6 +4,9 @@ This object represents the saved configuration of an object table in NetBox. Tab

 For example, you might wish to create a table config for the devices list to assist in inventory tasks. This view might show the device name, location, serial number, and asset tag, but omit operational details like IP addresses. Once applied, this table config can be saved for reuse in future audits.

+!!! note
+    Per‑user table preferences (columns and ordering remembered for an individual user) are distinct from Table Configs. If a list view fails to render due to outdated saved preferences, see [Clearing table preferences](../../features/user-preferences.md#clearing-table-preferences).
+
 ## Fields

 ### Name
@@ -20,7 +23,7 @@ The type of NetBox object to which the table config pertains.

 ### Table

-The name of the specific table to which the table config pertains. (Some NetBox object use multiple tables.)
+The name of the specific table to which the table config pertains. (Some NetBox objects use multiple tables.)

 ### Weight

--- a/docs/plugins/development/filtersets.md
+++ b/docs/plugins/development/filtersets.md
@@ -1,6 +1,6 @@
 # Filters & Filter Sets

-Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filters2](https://django-tables2.readthedocs.io/en/latest/) library to define filter sets.
+Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filter](https://django-filter.readthedocs.io/en/stable/) library to define filter sets.

 ## FilterSet Classes

--- a/docs/release-notes/version-4.4.md
+++ b/docs/release-notes/version-4.4.md
@@ -1,5 +1,34 @@
 # NetBox v4.4

+## v4.4.2 (2025-09-30)
+
+### Enhancements
+
+* [#17010](https://github.com/netbox-community/netbox/issues/17010) - Show admin navigation menu items only for staff & superusers
+* [#19590](https://github.com/netbox-community/netbox/issues/19590) - Add columns for device site & location to device component tables
+* [#19765](https://github.com/netbox-community/netbox/issues/19765) - Linkify assigned object types under saved filter view
+* [#20308](https://github.com/netbox-community/netbox/issues/20308) - Add a hotkey (`/`) for the global search field
+* [#20332](https://github.com/netbox-community/netbox/issues/20332) - Add a "none" option to object tag filters
+* [#20380](https://github.com/netbox-community/netbox/issues/20380) - Introduce the `SENTRY_CONFIG` configuration parameter
+* [#20412](https://github.com/netbox-community/netbox/issues/20412) - Linkify cluster type on virtual machine detail view
+* [#20438](https://github.com/netbox-community/netbox/issues/20438) - Add `facility` field to bulk edit forms for sites and locations
+
+### Bug Fixes
+
+* [#18878](https://github.com/netbox-community/netbox/issues/18878) - Automatically assign a designated primary MAC address upon creation of a new interface
+* [#20243](https://github.com/netbox-community/netbox/issues/20243) - Prevent scheduled system jobs from re-running multiple times
+* [#20253](https://github.com/netbox-community/netbox/issues/20253) - Fix support for filtering object contact assignments in GraphQL API
+* [#20365](https://github.com/netbox-community/netbox/issues/20365) - Address various inaccuracies in generated OpenAPI schema
+* [#20375](https://github.com/netbox-community/netbox/issues/20375) - Preserve filter parameters when performing bulk operations
+* [#20390](https://github.com/netbox-community/netbox/issues/20390) - Fix styling of page size selection dropdown
+* [#20392](https://github.com/netbox-community/netbox/issues/20392) - Clean up ordering of interface type options
+* [#20398](https://github.com/netbox-community/netbox/issues/20398) - Fix misleading error reporting for min/max custom field values
+* [#20419](https://github.com/netbox-community/netbox/issues/20419) - Correct action buttons for child object views
+* [#20425](https://github.com/netbox-community/netbox/issues/20425) - Fix Markdown preview functionality within "quick add" modal
+* [#20441](https://github.com/netbox-community/netbox/issues/20441) - Fix display of the "groups" column in contact assignments table 
+
+---
+
 ## v4.4.1 (2025-09-16)

 ### Enhancements
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -86,6 +86,7 @@ nav:
        - Change Logging: 'features/change-logging.md'
        - Journaling: 'features/journaling.md'
        - Event Rules: 'features/event-rules.md'
+        - User Preferences: 'features/user-preferences.md'
        - Notifications: 'features/notifications.md'
        - Background Jobs: 'features/background-jobs.md'
        - Auth & Permissions: 'features/authentication-permissions.md'
--- a/netbox/circuits/apps.py
+++ b/netbox/circuits/apps.py
@@ -1,5 +1,7 @@
 from django.apps import AppConfig

+from netbox import denormalized
+

 class CircuitsConfig(AppConfig):
    name = "circuits"
@@ -8,6 +10,16 @@ class CircuitsConfig(AppConfig):
    def ready(self):
        from netbox.models.features import register_models
        from . import signals, search  # noqa: F401
+        from .models import CircuitTermination

        # Register models
        register_models(*self.get_models())
+
+        denormalized.register(CircuitTermination, '_site', {
+            '_region': 'region',
+            '_site_group': 'group',
+        })
+
+        denormalized.register(CircuitTermination, '_location', {
+            '_site': 'site',
+        })
--- a/netbox/core/api/schema.py
+++ b/netbox/core/api/schema.py
@@ -282,18 +282,18 @@ class FixSerializedPKRelatedField(OpenApiSerializerFieldExtension):

 class FixIntegerRangeSerializerSchema(OpenApiSerializerExtension):
    target_class = 'netbox.api.fields.IntegerRangeSerializer'
+    match_subclasses = True

    def map_serializer(self, auto_schema: 'AutoSchema', direction: Direction) -> _SchemaType:
+        # One range = two integers; many=True will wrap this in an outer array
        return {
            'type': 'array',
            'items': {
-                'type': 'array',
-                'items': {
-                    'type': 'integer',
-                },
-                'minItems': 2,
-                'maxItems': 2,
+                'type': 'integer',
            },
+            'minItems': 2,
+            'maxItems': 2,
+            'example': [10, 20],
        }


--- a/netbox/core/api/serializers_/tasks.py
+++ b/netbox/core/api/serializers_/tasks.py
@@ -13,7 +13,7 @@ class BackgroundTaskSerializer(serializers.Serializer):
    url = serializers.HyperlinkedIdentityField(
        view_name='core-api:rqtask-detail',
        lookup_field='id',
-        lookup_url_kwarg='pk'
+        lookup_url_kwarg='id'
    )
    description = serializers.CharField()
    origin = serializers.CharField()
--- a/netbox/core/api/views.py
+++ b/netbox/core/api/views.py
@@ -5,7 +5,7 @@ from django_rq.queues import get_redis_connection
 from django_rq.settings import QUEUES_LIST
 from django_rq.utils import get_statistics
 from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import extend_schema
+from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
@@ -24,6 +24,7 @@ from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
 from netbox.api.metadata import ContentTypeMetadata
 from netbox.api.pagination import LimitOffsetListPagination
 from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
+
 from . import serializers


@@ -117,29 +118,49 @@ class BaseRQViewSet(viewsets.ViewSet):
    def get_serializer(self, *args, **kwargs):
        """
        Return the serializer instance that should be used for validating and
-        deserializing input, and for serializing output.
+        deserializing input and for serializing output.
        """
        serializer_class = self.get_serializer_class()
        kwargs['context'] = self.get_serializer_context()
        return serializer_class(*args, **kwargs)

+    def get_serializer_class(self):
+        """
+        Return the class to use for the serializer.
+        """
+        return self.serializer_class
+
+    def get_serializer_context(self):
+        """
+        Extra context provided to the serializer class.
+        """
+        return {
+            'request': self.request,
+            'format': self.format_kwarg,
+            'view': self,
+        }
+

 class BackgroundQueueViewSet(BaseRQViewSet):
    """
    Retrieve a list of RQ Queues.
-    Note: Queue names are not URL safe so not returning a detail view.
+    Note: Queue names are not URL safe, so not returning a detail view.
    """
    serializer_class = serializers.BackgroundQueueSerializer
    lookup_field = 'name'
    lookup_value_regex = r'[\w.@+-]+'

    def get_view_name(self):
-        return "Background Queues"
+        return 'Background Queues'

    def get_data(self):
-        return get_statistics(run_maintenance_tasks=True)["queues"]
+        return get_statistics(run_maintenance_tasks=True)['queues']

-    @extend_schema(responses={200: OpenApiTypes.OBJECT})
+    @extend_schema(
+        operation_id='core_background_queues_retrieve_by_name',
+        parameters=[OpenApiParameter(name='name', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
+        responses={200: OpenApiTypes.OBJECT},
+    )
    def retrieve(self, request, name):
        data = self.get_data()
        if not data:
@@ -161,12 +182,17 @@ class BackgroundWorkerViewSet(BaseRQViewSet):
    lookup_field = 'name'

    def get_view_name(self):
-        return "Background Workers"
+        return 'Background Workers'

    def get_data(self):
        config = QUEUES_LIST[0]
        return Worker.all(get_redis_connection(config['connection_config']))

+    @extend_schema(
+        operation_id='core_background_workers_retrieve_by_name',
+        parameters=[OpenApiParameter(name='name', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
+        responses={200: OpenApiTypes.OBJECT},
+    )
    def retrieve(self, request, name):
        # all the RQ queues should use the same connection
        config = QUEUES_LIST[0]
@@ -184,9 +210,10 @@ class BackgroundTaskViewSet(BaseRQViewSet):
    Retrieve a list of RQ Tasks.
    """
    serializer_class = serializers.BackgroundTaskSerializer
+    lookup_field = 'id'

    def get_view_name(self):
-        return "Background Tasks"
+        return 'Background Tasks'

    def get_data(self):
        return get_rq_jobs()
@@ -199,45 +226,53 @@ class BackgroundTaskViewSet(BaseRQViewSet):

        return task

-    @extend_schema(responses={200: OpenApiTypes.OBJECT})
-    def retrieve(self, request, pk):
+    @extend_schema(
+        operation_id='core_background_tasks_retrieve_by_id',
+        parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
+        responses={200: OpenApiTypes.OBJECT},
+    )
+    def retrieve(self, request, id):
        """
        Retrieve the details of the specified RQ Task.
        """
-        task = self.get_task_from_id(pk)
+        task = self.get_task_from_id(id)
        serializer = self.serializer_class(task, context={'request': request})
        return Response(serializer.data)

-    @action(methods=["POST"], detail=True)
-    def delete(self, request, pk):
+    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
+    @action(methods=['POST'], detail=True)
+    def delete(self, request, id):
        """
        Delete the specified RQ Task.
        """
-        delete_rq_job(pk)
+        delete_rq_job(id)
        return HttpResponse(status=200)

-    @action(methods=["POST"], detail=True)
-    def requeue(self, request, pk):
+    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
+    @action(methods=['POST'], detail=True)
+    def requeue(self, request, id):
        """
        Requeues the specified RQ Task.
        """
-        requeue_rq_job(pk)
+        requeue_rq_job(id)
        return HttpResponse(status=200)

-    @action(methods=["POST"], detail=True)
-    def enqueue(self, request, pk):
+    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
+    @action(methods=['POST'], detail=True)
+    def enqueue(self, request, id):
        """
        Enqueues the specified RQ Task.
        """
-        enqueue_rq_job(pk)
+        enqueue_rq_job(id)
        return HttpResponse(status=200)

-    @action(methods=["POST"], detail=True)
-    def stop(self, request, pk):
+    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
+    @action(methods=['POST'], detail=True)
+    def stop(self, request, id):
        """
        Stops the specified RQ Task.
        """
-        stopped_jobs = stop_rq_job(pk)
+        stopped_jobs = stop_rq_job(id)
        if len(stopped_jobs) == 1:
            return HttpResponse(status=200)
        else:
--- a/netbox/core/graphql/mixins.py
+++ b/netbox/core/graphql/mixins.py
@@ -3,12 +3,12 @@ from typing import Annotated, List, TYPE_CHECKING
 import strawberry
 import strawberry_django
 from django.contrib.contenttypes.models import ContentType
+from strawberry.types import Info

 from core.models import ObjectChange

 if TYPE_CHECKING:
-    from core.graphql.types import DataFileType, DataSourceType
-    from netbox.core.graphql.types import ObjectChangeType
+    from core.graphql.types import DataFileType, DataSourceType, ObjectChangeType

 __all__ = (
    'ChangelogMixin',
@@ -20,7 +20,7 @@ __all__ = (
 class ChangelogMixin:

    @strawberry_django.field
-    def changelog(self, info) -> List[Annotated["ObjectChangeType", strawberry.lazy('.types')]]:  # noqa: F821
+    def changelog(self, info: Info) -> List[Annotated['ObjectChangeType', strawberry.lazy('.types')]]:  # noqa: F821
        content_type = ContentType.objects.get_for_model(self)
        object_changes = ObjectChange.objects.filter(
            changed_object_type=content_type,
@@ -31,5 +31,5 @@ class ChangelogMixin:

@strawberry.type
 class SyncedDataMixin:
-    data_source: Annotated["DataSourceType", strawberry.lazy('core.graphql.types')] | None
-    data_file: Annotated["DataFileType", strawberry.lazy('core.graphql.types')] | None
+    data_source: Annotated['DataSourceType', strawberry.lazy('core.graphql.types')] | None
+    data_file: Annotated['DataFileType', strawberry.lazy('core.graphql.types')] | None
--- a/netbox/core/migrations/0019_configrevision_active.py
+++ b/netbox/core/migrations/0019_configrevision_active.py
@@ -0,0 +1,48 @@
+# Generated by Django 5.2.5 on 2025-09-09 16:48
+
+from django.db import migrations, models
+
+
+def get_active(apps, schema_editor):
+    from django.core.cache import cache
+    ConfigRevision = apps.get_model('core', 'ConfigRevision')
+    version = None
+    revision = None
+
+    # Try and get the latest version from cache
+    try:
+        version = cache.get('config_version')
+    except Exception:
+        pass
+
+    # If there is a version in cache, attempt to set revision to the current version from cache
+    # If the version in cache does not exist or there is no version, try the lastest revision in the database
+    if not version or (version and not (revision := ConfigRevision.objects.filter(pk=version).first())):
+        revision = ConfigRevision.objects.order_by('-created').first()
+
+    # If there is a revision set, set the active revision
+    if revision:
+        revision.active = True
+        revision.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0018_concrete_objecttype'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='configrevision',
+            name='active',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(code=get_active, reverse_code=migrations.RunPython.noop),
+        migrations.AddConstraint(
+            model_name='configrevision',
+            constraint=models.UniqueConstraint(
+                condition=models.Q(('active', True)), fields=('active',), name='unique_active_config_revision'
+            ),
+        ),
+    ]
--- a/netbox/core/models/config.py
+++ b/netbox/core/models/config.py
@@ -14,6 +14,9 @@ class ConfigRevision(models.Model):
    """
    An atomic revision of NetBox's configuration.
    """
+    active = models.BooleanField(
+        default=False
+    )
    created = models.DateTimeField(
        verbose_name=_('created'),
        auto_now_add=True
@@ -35,6 +38,13 @@ class ConfigRevision(models.Model):
        ordering = ['-created']
        verbose_name = _('config revision')
        verbose_name_plural = _('config revisions')
+        constraints = [
+            models.UniqueConstraint(
+                fields=('active',),
+                condition=models.Q(active=True),
+                name='unique_active_config_revision',
+            )
+        ]

    def __str__(self):
        if not self.pk:
@@ -59,8 +69,13 @@ class ConfigRevision(models.Model):
        """
        cache.set('config', self.data, None)
        cache.set('config_version', self.pk, None)
+
+        # Set all instances of ConfigRevision to false and set this instance to true
+        ConfigRevision.objects.all().update(active=False)
+        ConfigRevision.objects.filter(pk=self.pk).update(active=True)
+
    activate.alters_data = True

    @property
    def is_active(self):
-        return cache.get('config_version') == self.pk
+        return self.active
--- a/netbox/core/models/object_types.py
+++ b/netbox/core/models/object_types.py
@@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import ArrayField
 from django.contrib.postgres.indexes import GinIndex
 from django.core.exceptions import ObjectDoesNotExist
-from django.db import models
+from django.db import connection, models
 from django.db.models import Q
 from django.utils.translation import gettext as _

@@ -66,6 +66,14 @@ class ObjectTypeManager(models.Manager):
        """
        from netbox.models.features import get_model_features, model_is_public

+        # TODO: Remove this in NetBox v5.0
+        # If the ObjectType table has not yet been provisioned (e.g. because we're in a pre-v4.4 migration),
+        # fall back to ContentType.
+        if 'core_objecttype' not in connection.introspection.table_names():
+            ct = ContentType.objects.get_for_model(model, for_concrete_model=for_concrete_model)
+            ct.features = get_model_features(ct.model_class())
+            return ct
+
        if not inspect.isclass(model):
            model = model.__class__
        opts = self._get_opts(model, for_concrete_model)
--- a/netbox/core/plugins.py
+++ b/netbox/core/plugins.py
@@ -1,6 +1,5 @@
 import datetime
 import importlib
-import importlib.util
 from dataclasses import dataclass, field
 from typing import Optional

--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -1163,14 +1163,14 @@ class InterfaceTypeChoices(ChoiceSet):
            (
                (TYPE_1GE_BX10_D, '1000BASE-BX10-D (1GE BiDi Down)'),
                (TYPE_1GE_BX10_U, '1000BASE-BX10-U (1GE BiDi Up)'),
-                (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'),
                (TYPE_1GE_CWDM, '1000BASE-CWDM (1GE)'),
+                (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'),
                (TYPE_1GE_DWDM, '1000BASE-DWDM (1GE)'),
                (TYPE_1GE_EX, '1000BASE-EX (1GE)'),
-                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
                (TYPE_1GE_LSX, '1000BASE-LSX (1GE)'),
                (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE)'),
                (TYPE_1GE_LX10, '1000BASE-LX10/LH (1GE)'),
+                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
                (TYPE_1GE_FIXED, '1000BASE-T (1GE)'),
                (TYPE_1GE_TX_FIXED, '1000BASE-TX (1GE)'),
                (TYPE_1GE_ZX, '1000BASE-ZX (1GE)'),
@@ -1186,8 +1186,8 @@ class InterfaceTypeChoices(ChoiceSet):
        (
            _('10 Gbps Ethernet'),
            (
-                (TYPE_10GE_BR_D, '10GBASE-DR-D (10GE BiDi Down)'),
-                (TYPE_10GE_BR_U, '10GBASE-DR-U (10GE BiDi Up)'),
+                (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
+                (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
                (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
                (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
                (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
@@ -1235,6 +1235,7 @@ class InterfaceTypeChoices(ChoiceSet):
                (TYPE_100GE_CR2, '100GBASE-CR2 (100GE DAC)'),
                (TYPE_100GE_CR4, '100GBASE-CR4 (100GE DAC)'),
                (TYPE_100GE_CR10, '100GBASE-CR10 (100GE DAC)'),
+                (TYPE_100GE_CWDM4, '100GBASE-CWDM4 (100GE)'),
                (TYPE_100GE_DR, '100GBASE-DR (100GE)'),
                (TYPE_100GE_ER4, '100GBASE-ER4 (100GE)'),
                (TYPE_100GE_FR1, '100GBASE-FR1 (100GE)'),
@@ -1253,12 +1254,12 @@ class InterfaceTypeChoices(ChoiceSet):
            (
                (TYPE_200GE_CR2, '200GBASE-CR2 (200GE)'),
                (TYPE_200GE_CR4, '200GBASE-CR4 (200GE)'),
-                (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'),
-                (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'),
                (TYPE_200GE_DR4, '200GBASE-DR4 (200GE)'),
                (TYPE_200GE_ER4, '200GBASE-ER4 (200GE)'),
                (TYPE_200GE_FR4, '200GBASE-FR4 (200GE)'),
                (TYPE_200GE_LR4, '200GBASE-LR4 (200GE)'),
+                (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'),
+                (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'),
                (TYPE_200GE_VR2, '200GBASE-VR2 (200GE)'),
            )
        ),
@@ -1296,34 +1297,34 @@ class InterfaceTypeChoices(ChoiceSet):
                (TYPE_1GE_GBIC, 'GBIC (1GE)'),
                (TYPE_1GE_SFP, 'SFP (1GE)'),
                (TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'),
-                (TYPE_10GE_XFP, 'XFP (10GE)'),
                (TYPE_10GE_XENPAK, 'XENPAK (10GE)'),
+                (TYPE_10GE_XFP, 'XFP (10GE)'),
                (TYPE_10GE_X2, 'X2 (10GE)'),
                (TYPE_25GE_SFP28, 'SFP28 (25GE)'),
-                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                (TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'),
                (TYPE_50GE_QSFP28, 'QSFP28 (50GE)'),
+                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                (TYPE_100GE_CFP, 'CFP (100GE)'),
                (TYPE_100GE_CFP2, 'CFP2 (100GE)'),
-                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
-                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
                (TYPE_100GE_CFP4, 'CFP4 (100GE)'),
                (TYPE_100GE_CXP, 'CXP (100GE)'),
                (TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'),
                (TYPE_100GE_DSFP, 'DSFP (100GE)'),
-                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
                (TYPE_100GE_QSFP28, 'QSFP28 (100GE)'),
                (TYPE_100GE_QSFP_DD, 'QSFP-DD (100GE)'),
+                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
+                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
                (TYPE_200GE_QSFP56, 'QSFP56 (200GE)'),
                (TYPE_200GE_QSFP_DD, 'QSFP-DD (200GE)'),
                (TYPE_400GE_QSFP112, 'QSFP112 (400GE)'),
                (TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'),
+                (TYPE_400GE_CDFP, 'CDFP (400GE)'),
+                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
+                (TYPE_400GE_CFP8, 'CPF8 (400GE)'),
                (TYPE_400GE_OSFP, 'OSFP (400GE)'),
                (TYPE_400GE_OSFP_RHS, 'OSFP-RHS (400GE)'),
-                (TYPE_400GE_CDFP, 'CDFP (400GE)'),
-                (TYPE_400GE_CFP8, 'CPF8 (400GE)'),
-                (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'),
                (TYPE_800GE_OSFP, 'OSFP (800GE)'),
+                (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'),
            )
        ),
        (
--- a/netbox/dcim/fields.py
+++ b/netbox/dcim/fields.py
@@ -26,7 +26,7 @@ class eui64_unix_expanded_uppercase(eui64_unix_expanded):
 #

 class MACAddressField(models.Field):
-    description = "PostgreSQL MAC Address field"
+    description = 'PostgreSQL MAC Address field'

    def python_type(self):
        return EUI
@@ -34,6 +34,9 @@ class MACAddressField(models.Field):
    def from_db_value(self, value, expression, connection):
        return self.to_python(value)

+    def get_internal_type(self):
+        return 'CharField'
+
    def to_python(self, value):
        if value is None:
            return value
@@ -54,7 +57,7 @@ class MACAddressField(models.Field):


 class WWNField(models.Field):
-    description = "World Wide Name field"
+    description = 'World Wide Name field'

    def python_type(self):
        return EUI
@@ -62,6 +65,9 @@ class WWNField(models.Field):
    def from_db_value(self, value, expression, connection):
        return self.to_python(value)

+    def get_internal_type(self):
+        return 'CharField'
+
    def to_python(self, value):
        if value is None:
            return value
--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@@ -133,6 +133,11 @@ class SiteBulkEditForm(NetBoxModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
+    facility = forms.CharField(
+        label=_('Facility'),
+        max_length=50,
+        required=False
+    )
    asns = DynamicModelMultipleChoiceField(
        queryset=ASN.objects.all(),
        label=_('ASNs'),
@@ -166,10 +171,10 @@ class SiteBulkEditForm(NetBoxModelBulkEditForm):

    model = Site
    fieldsets = (
-        FieldSet('status', 'region', 'group', 'tenant', 'asns', 'time_zone', 'description'),
+        FieldSet('status', 'region', 'group', 'tenant', 'facility', 'asns', 'time_zone', 'description'),
    )
    nullable_fields = (
-        'region', 'group', 'tenant', 'asns', 'time_zone', 'description', 'comments',
+        'region', 'group', 'tenant', 'facility', 'asns', 'time_zone', 'description', 'comments',
    )


@@ -198,6 +203,11 @@ class LocationBulkEditForm(NetBoxModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
+    facility = forms.CharField(
+        label=_('Facility'),
+        max_length=50,
+        required=False
+    )
    description = forms.CharField(
        label=_('Description'),
        max_length=200,
@@ -207,9 +217,9 @@ class LocationBulkEditForm(NetBoxModelBulkEditForm):

    model = Location
    fieldsets = (
-        FieldSet('site', 'parent', 'status', 'tenant', 'description'),
+        FieldSet('site', 'parent', 'status', 'tenant', 'facility', 'description'),
    )
-    nullable_fields = ('parent', 'tenant', 'description', 'comments')
+    nullable_fields = ('parent', 'tenant', 'facility', 'description', 'comments')


 class RackRoleBulkEditForm(NetBoxModelBulkEditForm):
--- a/netbox/dcim/graphql/gfk_mixins.py
+++ b/netbox/dcim/graphql/gfk_mixins.py
@@ -1,3 +1,5 @@
+from strawberry.types import Info
+
 from circuits.graphql.types import CircuitTerminationType, ProviderNetworkType
 from circuits.models import CircuitTermination, ProviderNetwork
 from dcim.graphql.types import (
@@ -49,7 +51,7 @@ class InventoryItemTemplateComponentType:
        )

    @classmethod
-    def resolve_type(cls, instance, info):
+    def resolve_type(cls, instance, info: Info):
        if type(instance) is ConsolePortTemplate:
            return ConsolePortTemplateType
        if type(instance) is ConsoleServerPortTemplate:
@@ -79,7 +81,7 @@ class InventoryItemComponentType:
        )

    @classmethod
-    def resolve_type(cls, instance, info):
+    def resolve_type(cls, instance, info: Info):
        if type(instance) is ConsolePort:
            return ConsolePortType
        if type(instance) is ConsoleServerPort:
@@ -112,7 +114,7 @@ class ConnectedEndpointType:
        )

    @classmethod
-    def resolve_type(cls, instance, info):
+    def resolve_type(cls, instance, info: Info):
        if type(instance) is CircuitTermination:
            return CircuitTerminationType
        if type(instance) is ConsolePortType:
--- a/netbox/dcim/migrations/0188_racktype.py
+++ b/netbox/dcim/migrations/0188_racktype.py
@@ -3,9 +3,7 @@ import django.db.models.deletion
 import taggit.managers
 from django.db import migrations, models

-import utilities.fields
 import utilities.json
-import utilities.ordering


 class Migration(migrations.Migration):
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -632,10 +632,17 @@ class BaseInterface(models.Model):
            })

        # Check that the primary MAC address (if any) is assigned to this interface
-        if self.primary_mac_address and self.primary_mac_address.assigned_object != self:
+        if (
+                self.primary_mac_address and
+                self.primary_mac_address.assigned_object is not None and
+                self.primary_mac_address.assigned_object != self
+        ):
            raise ValidationError({
-                'primary_mac_address': _("MAC address {mac_address} is not assigned to this interface.").format(
-                    mac_address=self.primary_mac_address
+                'primary_mac_address': _(
+                    "MAC address {mac_address} is assigned to a different interface ({interface})."
+                ).format(
+                    mac_address=self.primary_mac_address,
+                    interface=self.primary_mac_address.assigned_object,
                )
            })

--- a/netbox/dcim/signals.py
+++ b/netbox/dcim/signals.py
@@ -4,6 +4,7 @@ from django.db.models.signals import post_save, post_delete, pre_delete
 from django.dispatch import receiver

 from dcim.choices import CableEndChoices, LinkStatusChoices
+from virtualization.models import VMInterface
 from .models import (
    Cable, CablePath, CableTermination, ConsolePort, ConsoleServerPort, Device, DeviceBay, FrontPort, Interface,
    InventoryItem, ModuleBay, PathEndpoint, PowerOutlet, PowerPanel, PowerPort, Rack, RearPort, Location,
@@ -170,3 +171,15 @@ def extend_rearport_cable_paths(instance, created, raw, **kwargs):
        rearport = instance.rear_port
        for cablepath in CablePath.objects.filter(_nodes__contains=rearport):
            cablepath.retrace()
+
+
+@receiver(post_save, sender=Interface)
+@receiver(post_save, sender=VMInterface)
+def update_mac_address_interface(instance, created, raw, **kwargs):
+    """
+    When creating a new Interface or VMInterface, check whether a MACAddress has been designated as its primary. If so,
+    assign the MACAddress to the interface.
+    """
+    if created and not raw and instance.primary_mac_address:
+        instance.primary_mac_address.assigned_object = instance
+        instance.primary_mac_address.save()
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -196,7 +196,7 @@ class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
        verbose_name=_('Type')
    )
    u_height = columns.TemplateColumn(
-        accessor=tables.A('device_type.u_height'),
+        accessor=tables.A('device_type__u_height'),
        verbose_name=_('U Height'),
        template_code='{{ value|floatformat }}'
    )
--- a/netbox/extras/api/serializers_/customfields.py
+++ b/netbox/extras/api/serializers_/customfields.py
@@ -26,6 +26,7 @@ class CustomFieldChoiceSetSerializer(ChangeLogMessageSerializer, ValidatedModelS
            max_length=2
        )
    )
+    choices_count = serializers.IntegerField(read_only=True)

    class Meta:
        model = CustomFieldChoiceSet
--- a/netbox/extras/graphql/mixins.py
+++ b/netbox/extras/graphql/mixins.py
@@ -2,6 +2,7 @@ from typing import TYPE_CHECKING, Annotated, List

 import strawberry
 import strawberry_django
+from strawberry.types import Info

 __all__ = (
    'ConfigContextMixin',
@@ -37,7 +38,7 @@ class CustomFieldsMixin:
 class ImageAttachmentsMixin:

    @strawberry_django.field
-    def image_attachments(self, info) -> List[Annotated["ImageAttachmentType", strawberry.lazy('.types')]]:
+    def image_attachments(self, info: Info) -> List[Annotated['ImageAttachmentType', strawberry.lazy('.types')]]:
        return self.images.restrict(info.context.request.user, 'view')


@@ -45,17 +46,17 @@ class ImageAttachmentsMixin:
 class JournalEntriesMixin:

    @strawberry_django.field
-    def journal_entries(self, info) -> List[Annotated["JournalEntryType", strawberry.lazy('.types')]]:
+    def journal_entries(self, info: Info) -> List[Annotated['JournalEntryType', strawberry.lazy('.types')]]:
        return self.journal_entries.all()


@strawberry.type
 class TagsMixin:

-    tags: List[Annotated["TagType", strawberry.lazy('.types')]]
+    tags: List[Annotated['TagType', strawberry.lazy('.types')]]


@strawberry.type
 class ContactsMixin:

-    contacts: List[Annotated["ContactAssignmentType", strawberry.lazy('tenancy.graphql.types')]]
+    contacts: List[Annotated['ContactAssignmentType', strawberry.lazy('tenancy.graphql.types')]]
--- a/netbox/extras/lookups.py
+++ b/netbox/extras/lookups.py
@@ -1,9 +1,39 @@
+from django.contrib.postgres.fields import ArrayField
+from django.contrib.postgres.fields.ranges import RangeField
 from django.db.models import CharField, JSONField, Lookup
 from django.db.models.fields.json import KeyTextTransform

 from .fields import CachedValueField


+class RangeContains(Lookup):
+    """
+    Filter ArrayField(RangeField) columns where ANY element-range contains the scalar RHS.
+
+    Usage (ORM):
+        Model.objects.filter(<range_array_field>__range_contains=<scalar>)
+
+    Works with int4range[], int8range[], daterange[], tstzrange[], etc.
+    """
+
+    lookup_name = 'range_contains'
+
+    def as_sql(self, compiler, connection):
+        # Compile LHS (the array-of-ranges column/expression) and RHS (scalar)
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
+
+        # Guard: only allow ArrayField whose base_field is a PostgreSQL RangeField
+        field = getattr(self.lhs, 'output_field', None)
+        if not (isinstance(field, ArrayField) and isinstance(field.base_field, RangeField)):
+            raise TypeError('range_contains is only valid for ArrayField(RangeField) columns')
+
+        # Range-contains-element using EXISTS + UNNEST keeps the range on the LHS: r @> value
+        sql = f"EXISTS (SELECT 1 FROM unnest({lhs}) AS r WHERE r @> {rhs})"
+        params = lhs_params + rhs_params
+        return sql, params
+
+
 class Empty(Lookup):
    """
    Filter on whether a string is empty.
@@ -25,7 +55,7 @@ class JSONEmpty(Lookup):

    A key is considered empty if it is "", null, or does not exist.
    """
-    lookup_name = "empty"
+    lookup_name = 'empty'

    def as_sql(self, compiler, connection):
        # self.lhs.lhs is the parent expression (could be a JSONField or another KeyTransform)
@@ -69,6 +99,7 @@ class NetContainsOrEquals(Lookup):
        return 'CAST(%s AS INET) >>= %s' % (lhs, rhs), params


+ArrayField.register_lookup(RangeContains)
 CharField.register_lookup(Empty)
 JSONField.register_lookup(JSONEmpty)
 CachedValueField.register_lookup(NetHost)
--- a/netbox/extras/querysets.py
+++ b/netbox/extras/querysets.py
@@ -90,7 +90,7 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
                ConfigContext.objects.filter(
                    self._get_config_context_filters()
                ).annotate(
-                    _data=EmptyGroupByJSONBAgg('data', ordering=['weight', 'name'])
+                    _data=EmptyGroupByJSONBAgg('data', order_by=['weight', 'name'])
                ).values("_data").order_by()
            )
        )
--- a/netbox/ipam/fields.py
+++ b/netbox/ipam/fields.py
@@ -26,6 +26,9 @@ class BaseIPField(models.Field):
    def from_db_value(self, value, expression, connection):
        return self.to_python(value)

+    def get_internal_type(self):
+        return 'CharField'
+
    def to_python(self, value):
        if not value:
            return value
@@ -57,7 +60,7 @@ class IPNetworkField(BaseIPField):
    """
    IP prefix (network and mask)
    """
-    description = "PostgreSQL CIDR field"
+    description = 'PostgreSQL CIDR field'
    default_validators = [validators.prefix_validator]

    def db_type(self, connection):
@@ -83,7 +86,7 @@ class IPAddressField(BaseIPField):
    """
    IP address (host address and mask)
    """
-    description = "PostgreSQL INET field"
+    description = 'PostgreSQL INET field'

    def db_type(self, connection):
        return 'inet'
@@ -110,7 +113,7 @@ IPAddressField.register_lookup(lookups.Inet)


 class ASNField(models.BigIntegerField):
-    description = "32-bit ASN field"
+    description = '32-bit ASN field'
    default_validators = [
        MinValueValidator(BGP_ASN_MIN),
        MaxValueValidator(BGP_ASN_MAX),
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -354,13 +354,13 @@ class PrefixFilterSet(NetBoxModelFilterSet, ScopedFilterSet, TenancyFilterSet, C
    vlan_group_id = django_filters.ModelMultipleChoiceFilter(
        field_name='vlan__group',
        queryset=VLANGroup.objects.all(),
-        to_field_name="id",
+        to_field_name='id',
        label=_('VLAN Group (ID)'),
    )
    vlan_group = django_filters.ModelMultipleChoiceFilter(
        field_name='vlan__group__slug',
        queryset=VLANGroup.objects.all(),
-        to_field_name="slug",
+        to_field_name='slug',
        label=_('VLAN Group (slug)'),
    )
    vlan_id = django_filters.ModelMultipleChoiceFilter(
@@ -695,12 +695,12 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFil
        return queryset.filter(q)

    def parse_inet_addresses(self, value):
-        '''
+        """
        Parse networks or IP addresses and cast to a format
        acceptable by the Postgres inet type.

        Skips invalid values.
-        '''
+        """
        parsed = []
        for addr in value:
            if netaddr.valid_ipv4(addr) or netaddr.valid_ipv6(addr):
@@ -718,7 +718,7 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFil
        # as argument. If they are all invalid,
        # we return an empty queryset
        value = self.parse_inet_addresses(value)
-        if (len(value) == 0):
+        if len(value) == 0:
            return queryset.none()

        try:
@@ -908,7 +908,8 @@ class VLANGroupFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
        method='filter_scope'
    )
    contains_vid = django_filters.NumberFilter(
-        method='filter_contains_vid'
+        field_name='vid_ranges',
+        lookup_expr='range_contains',
    )

    class Meta:
@@ -931,21 +932,6 @@ class VLANGroupFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
            scope_id=value
        )

-    def filter_contains_vid(self, queryset, name, value):
-        """
-        Return all VLANGroups which contain the given VLAN ID.
-        """
-        table_name = VLANGroup._meta.db_table
-        # TODO: See if this can be optimized without compromising queryset integrity
-        # Expand VLAN ID ranges to query by integer
-        groups = VLANGroup.objects.raw(
-            f'SELECT id FROM {table_name}, unnest(vid_ranges) vid_range WHERE %s <@ vid_range',
-            params=(value,)
-        )
-        return queryset.filter(
-            pk__in=[g.id for g in groups]
-        )
-

 class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
    region_id = TreeNodeMultipleChoiceFilter(
@@ -1079,6 +1065,7 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
    def get_for_virtualmachine(self, queryset, name, value):
        return queryset.get_for_virtualmachine(value)

+    @extend_schema_field(OpenApiTypes.INT)
    def filter_interface_id(self, queryset, name, value):
        if value is None:
            return queryset.none()
@@ -1087,6 +1074,7 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
            Q(interfaces_as_untagged=value)
        ).distinct()

+    @extend_schema_field(OpenApiTypes.INT)
    def filter_vminterface_id(self, queryset, name, value):
        if value is None:
            return queryset.none()
--- a/netbox/ipam/graphql/filters.py
+++ b/netbox/ipam/graphql/filters.py
@@ -19,7 +19,7 @@ from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
 from virtualization.models import VMInterface

 if TYPE_CHECKING:
-    from netbox.graphql.filter_lookups import IntegerArrayLookup, IntegerLookup
+    from netbox.graphql.filter_lookups import IntegerLookup, IntegerRangeArrayLookup
    from circuits.graphql.filters import ProviderFilter
    from core.graphql.filters import ContentTypeFilter
    from dcim.graphql.filters import SiteFilter
@@ -340,7 +340,7 @@ class VLANFilter(TenancyFilterMixin, PrimaryModelFilterMixin):

@strawberry_django.filter_type(models.VLANGroup, lookups=True)
 class VLANGroupFilter(ScopedFilterMixin, OrganizationalModelFilterMixin):
-    vid_ranges: Annotated['IntegerArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+    vid_ranges: Annotated['IntegerRangeArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )

--- a/netbox/ipam/graphql/types.py
+++ b/netbox/ipam/graphql/types.py
@@ -74,7 +74,7 @@ class BaseIPAddressFamilyType:
    filters=ASNFilter,
    pagination=True
 )
-class ASNType(NetBoxObjectType):
+class ASNType(NetBoxObjectType, ContactsMixin):
    asn: BigInt
    rir: Annotated["RIRType", strawberry.lazy('ipam.graphql.types')] | None
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -548,7 +548,7 @@ class IPRange(ContactsMixin, PrimaryModel):
    mark_utilized = models.BooleanField(
        verbose_name=_('mark utilized'),
        default=False,
-        help_text=_("Report space as 100% utilized")
+        help_text=_("Report space as fully utilized")
    )

    clone_fields = (
--- a/netbox/ipam/tests/test_filtersets.py
+++ b/netbox/ipam/tests/test_filtersets.py
@@ -1723,6 +1723,10 @@ class VLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
        params = {'contains_vid': 1}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8)
+        params = {'contains_vid': 12}  # 11 is NOT in [1,11)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+        params = {'contains_vid': 4095}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0)

    def test_region(self):
        params = {'region': Region.objects.first().pk}
--- a/netbox/ipam/tests/test_lookups.py
+++ b/netbox/ipam/tests/test_lookups.py
@@ -0,0 +1,66 @@
+from django.test import TestCase
+from django.db.backends.postgresql.psycopg_any import NumericRange
+from ipam.models import VLANGroup
+
+
+class VLANGroupRangeContainsLookupTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        # Two ranges: [1,11) and [20,31)
+        cls.g1 = VLANGroup.objects.create(
+            name='VlanGroup-A',
+            slug='VlanGroup-A',
+            vid_ranges=[NumericRange(1, 11), NumericRange(20, 31)],
+        )
+        # One range: [100,201)
+        cls.g2 = VLANGroup.objects.create(
+            name='VlanGroup-B',
+            slug='VlanGroup-B',
+            vid_ranges=[NumericRange(100, 201)],
+        )
+        cls.g_empty = VLANGroup.objects.create(
+            name='VlanGroup-empty',
+            slug='VlanGroup-empty',
+            vid_ranges=[],
+        )
+
+    def test_contains_value_in_first_range(self):
+        """
+        Tests whether a specific value is contained within the first range in a queried
+        set of VLANGroup objects.
+        """
+        names = list(
+            VLANGroup.objects.filter(vid_ranges__range_contains=10).values_list('name', flat=True).order_by('name')
+        )
+        self.assertEqual(names, ['VlanGroup-A'])
+
+    def test_contains_value_in_second_range(self):
+        """
+        Tests if a value exists in the second range of VLANGroup objects and
+        validates the result against the expected list of names.
+        """
+        names = list(
+            VLANGroup.objects.filter(vid_ranges__range_contains=25).values_list('name', flat=True).order_by('name')
+        )
+        self.assertEqual(names, ['VlanGroup-A'])
+
+    def test_upper_bound_is_exclusive(self):
+        """
+        Tests if the upper bound of the range is exclusive in the filter method.
+        """
+        # 11 is NOT in [1,11)
+        self.assertFalse(VLANGroup.objects.filter(vid_ranges__range_contains=11).exists())
+
+    def test_no_match_far_outside(self):
+        """
+        Tests that no VLANGroup contains a VID within a specified range far outside
+        common VID bounds and returns `False`.
+        """
+        self.assertFalse(VLANGroup.objects.filter(vid_ranges__range_contains=4095).exists())
+
+    def test_empty_array_never_matches(self):
+        """
+        Tests the behavior of VLANGroup objects when an empty array is used to match a
+        specific condition.
+        """
+        self.assertFalse(VLANGroup.objects.filter(pk=self.g_empty.pk, vid_ranges__range_contains=1).exists())
--- a/netbox/netbox/api/fields.py
+++ b/netbox/netbox/api/fields.py
@@ -169,7 +169,7 @@ class IntegerRangeSerializer(serializers.Serializer):
        if type(data[0]) is not int or type(data[1]) is not int:
            raise ValidationError(_("Range boundaries must be defined as integers."))

-        return NumericRange(data[0], data[1], bounds='[]')
+        return NumericRange(data[0], data[1] + 1, bounds='[)')

    def to_representation(self, instance):
        return instance.lower, instance.upper - 1
--- a/netbox/netbox/api/pagination.py
+++ b/netbox/netbox/api/pagination.py
@@ -44,22 +44,28 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
            return list(queryset[self.offset:])

    def get_limit(self, request):
+        max_limit = self.default_limit
+        MAX_PAGE_SIZE = get_config().MAX_PAGE_SIZE
+        if MAX_PAGE_SIZE:
+            max_limit = min(max_limit, MAX_PAGE_SIZE)
+
        if self.limit_query_param:
-            MAX_PAGE_SIZE = get_config().MAX_PAGE_SIZE
-            if MAX_PAGE_SIZE:
-                MAX_PAGE_SIZE = max(MAX_PAGE_SIZE, self.default_limit)
            try:
                limit = int(request.query_params[self.limit_query_param])
                if limit < 0:
                    raise ValueError()
-                # Enforce maximum page size, if defined
+
                if MAX_PAGE_SIZE:
-                    return MAX_PAGE_SIZE if limit == 0 else min(limit, MAX_PAGE_SIZE)
-                return limit
+                    if limit == 0:
+                        max_limit = MAX_PAGE_SIZE
+                    else:
+                        max_limit = min(MAX_PAGE_SIZE, limit)
+                else:
+                    max_limit = limit
            except (KeyError, ValueError):
                pass

-        return self.default_limit
+        return max_limit

    def get_queryset_count(self, queryset):
        return queryset.count()
--- a/netbox/netbox/config/init.py
+++ b/netbox/netbox/config/init.py
@@ -78,11 +78,16 @@ class Config:
        from core.models import ConfigRevision

        try:
-            revision = ConfigRevision.objects.last()
+            # Enforce the creation date as the ordering parameter
+            revision = ConfigRevision.objects.get(active=True)
+            logger.debug(f"Loaded active configuration revision #{revision.pk}")
+        except (ConfigRevision.DoesNotExist, ConfigRevision.MultipleObjectsReturned):
+            logger.warning("No active configuration revision found - falling back to most recent")
+            revision = ConfigRevision.objects.order_by('-created').first()
            if revision is None:
                logger.debug("No previous configuration found in database; proceeding with default values")
                return
-            logger.debug("Loaded configuration data from database")
+            logger.debug(f"Using fallback configuration revision #{revision.pk}")
        except DatabaseError:
            # The database may not be available yet (e.g. when running a management command)
            logger.warning("Skipping config initialization (database unavailable)")
--- a/netbox/netbox/graphql/filter_lookups.py
+++ b/netbox/netbox/graphql/filter_lookups.py
@@ -7,6 +7,7 @@ from django.core.exceptions import FieldDoesNotExist
 from django.db.models import Q, QuerySet
 from django.db.models.fields.related import ForeignKey, ManyToManyField, ManyToManyRel, ManyToOneRel
 from strawberry import ID
+from strawberry.directive import DirectiveValue
 from strawberry.types import Info
 from strawberry_django import (
    ComparisonFilterLookup,
@@ -24,6 +25,7 @@ __all__ = (
    'FloatLookup',
    'IntegerArrayLookup',
    'IntegerLookup',
+    'IntegerRangeArrayLookup',
    'JSONFilter',
    'StringArrayLookup',
    'TreeNodeFilter',
@@ -67,7 +69,7 @@ class IntegerLookup:
        return None

    @strawberry_django.filter_field
-    def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+    def filter(self, info: Info, queryset: QuerySet, prefix: DirectiveValue[str] = '') -> Tuple[QuerySet, Q]:
        filters = self.get_filter()

        if not filters:
@@ -90,7 +92,7 @@ class FloatLookup:
        return None

    @strawberry_django.filter_field
-    def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+    def filter(self, info: Info, queryset: QuerySet, prefix: DirectiveValue[str] = '') -> Tuple[QuerySet, Q]:
        filters = self.get_filter()

        if not filters:
@@ -109,7 +111,7 @@ class JSONFilter:
    lookup: JSONLookup

    @strawberry_django.filter_field
-    def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+    def filter(self, info: Info, queryset: QuerySet, prefix: DirectiveValue[str] = '') -> Tuple[QuerySet, Q]:
        filters = self.lookup.get_filter()

        if not filters:
@@ -136,7 +138,7 @@ class TreeNodeFilter:
    match_type: TreeNodeMatch

    @strawberry_django.filter_field
-    def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+    def filter(self, info: Info, queryset: QuerySet, prefix: DirectiveValue[str] = '') -> Tuple[QuerySet, Q]:
        model_field_name = prefix.removesuffix('__').removesuffix('_id')
        model_field = None
        try:
@@ -217,3 +219,30 @@ class FloatArrayLookup(ArrayLookup[float]):
@strawberry.input(one_of=True, description='Lookup for Array fields. Only one of the lookup fields can be set.')
 class StringArrayLookup(ArrayLookup[str]):
    pass
+
+
+@strawberry.input(one_of=True, description='Lookups for an ArrayField(RangeField). Only one may be set.')
+class RangeArrayValueLookup(Generic[T]):
+    """
+    class for Array field of Range fields lookups
+    """
+
+    contains: T | None = strawberry.field(
+        default=strawberry.UNSET, description='Return rows where any stored range contains this value.'
+    )
+
+    @strawberry_django.filter_field
+    def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+        """
+        Map GraphQL: { <field>: { contains: <T> } } To Django ORM: <field>__range_contains=<T>
+        """
+        if self.contains is strawberry.UNSET or self.contains is None:
+            return queryset, Q()
+
+        # Build '<prefix>range_contains' so it works for nested paths too
+        return queryset, Q(**{f'{prefix}range_contains': self.contains})
+
+
+@strawberry.input(one_of=True, description='Lookups for an ArrayField(IntegerRangeField). Only one may be set.')
+class IntegerRangeArrayLookup(RangeArrayValueLookup[int]):
+    pass
--- a/netbox/netbox/graphql/types.py
+++ b/netbox/netbox/graphql/types.py
@@ -1,5 +1,6 @@
 import strawberry
 import strawberry_django
+from strawberry.types import Info
 from django.contrib.contenttypes.models import ContentType

 from core.graphql.mixins import ChangelogMixin
@@ -26,7 +27,7 @@ class BaseObjectType:
    """

    @classmethod
-    def get_queryset(cls, queryset, info, **kwargs):
+    def get_queryset(cls, queryset, info: Info, **kwargs):
        # Enforce object permissions on the queryset
        if hasattr(queryset, 'restrict'):
            return queryset.restrict(info.context.request.user, 'view')
--- a/netbox/netbox/jobs.py
+++ b/netbox/netbox/jobs.py
@@ -4,6 +4,7 @@ from datetime import timedelta

 from django.core.exceptions import ImproperlyConfigured
 from django.utils.functional import classproperty
+from django.utils import timezone
 from django_pglocks import advisory_lock
 from rq.timeouts import JobTimeoutException

@@ -113,7 +114,11 @@ class JobRunner(ABC):
        # If the executed job is a periodic job, schedule its next execution at the specified interval.
        finally:
            if job.interval:
-                new_scheduled_time = (job.scheduled or job.started) + timedelta(minutes=job.interval)
+                # Determine the new scheduled time. Cannot be earlier than one minute in the future.
+                new_scheduled_time = max(
+                    (job.scheduled or job.started) + timedelta(minutes=job.interval),
+                    timezone.now() + timedelta(minutes=1)
+                )
                if job.object and getattr(job.object, "python_class", None):
                    kwargs["job_timeout"] = job.object.python_class.job_timeout
                cls.enqueue(
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -673,10 +673,15 @@ def has_feature(model_or_ct, feature):
    # If an ObjectType was passed, we can use it directly
    if type(model_or_ct) is ObjectType:
        ot = model_or_ct
-    # If a ContentType was passed, resolve its model class
+    # If a ContentType was passed, resolve its model class and run the associated feature test
    elif type(model_or_ct) is ContentType:
-        model_class = model_or_ct.model_class()
-        ot = ObjectType.objects.get_for_model(model_class) if model_class else None
+        model = model_or_ct.model_class()
+        try:
+            test_func = registry['model_features'][feature]
+        except KeyError:
+            # Unknown feature
+            return False
+        return test_func(model)
    # For anything else, look up the ObjectType
    else:
        ot = ObjectType.objects.get_for_model(model_or_ct)
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -238,7 +238,8 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
        model = self.queryset.model

        initial_data = normalize_querydict(request.GET)
-        form = self.form(instance=obj, initial=initial_data)
+        form_prefix = 'quickadd' if request.GET.get('_quickadd') else None
+        form = self.form(instance=obj, initial=initial_data, prefix=form_prefix)
        restrict_form_fields(form, request.user)

        context = {
--- a/netbox/project-static/dist/netbox.js
+++ b/netbox/project-static/dist/netbox.js
--- a/netbox/project-static/dist/netbox.js.map
+++ b/netbox/project-static/dist/netbox.js.map
--- a/netbox/project-static/package.json
+++ b/netbox/project-static/package.json
@@ -29,8 +29,8 @@
    "flatpickr": "4.6.13",
    "gridstack": "12.3.3",
    "htmx.org": "2.0.7",
-    "query-string": "9.3.0",
-    "sass": "1.92.1",
+    "query-string": "9.3.1",
+    "sass": "1.93.2",
    "tom-select": "2.4.3",
    "typeface-inter": "3.18.1",
    "typeface-roboto-mono": "1.1.13"
--- a/netbox/project-static/src/buttons/markdownPreview.ts
+++ b/netbox/project-static/src/buttons/markdownPreview.ts
@@ -1,5 +1,3 @@
-import { isTruthy } from 'src/util';
-
 /**
 * interface for htmx configRequest event
 */
@@ -17,15 +15,6 @@ function initMarkdownPreview(markdownWidget: HTMLDivElement) {
  const textarea = markdownWidget.querySelector('textarea') as HTMLTextAreaElement;
  const preview = markdownWidget.querySelector('div.preview') as HTMLDivElement;

-  /**
-   * Make sure the textarea has style attribute height
-   * So that it can be copied over to preview div.
-   */
-  if (!isTruthy(textarea.style.height)) {
-    const { height } = textarea.getBoundingClientRect();
-    textarea.style.height = `${height}px`;
-  }
-
  /**
   * Add the value of the textarea to the body of the htmx request
   * and copy the height of text are to the preview div
--- a/netbox/project-static/yarn.lock
+++ b/netbox/project-static/yarn.lock
@@ -2990,10 +2990,10 @@ punycode@^2.1.0:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==

-query-string@9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-9.3.0.tgz#f2d60d6b4442cb445f374b5ff749b937b2cccd03"
-  integrity sha512-IQHOQ9aauHAApwAaUYifpEyLHv6fpVGVkMOnwPzcDScLjbLj8tLsILn6unSW79NafOw1llh8oK7Gd0VwmXBFmA==
+query-string@9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-9.3.1.tgz#d0c93e6c7fb7c17bdf04aa09e382114580ede270"
+  integrity sha512-5fBfMOcDi5SA9qj5jZhWAcTtDfKF5WFdd2uD9nVNlbxVv1baq65aALy6qofpNEGELHvisjjasxQp7BlM9gvMzw==
  dependencies:
    decode-uri-component "^0.4.1"
    filter-obj "^5.1.0"
@@ -3190,10 +3190,10 @@ safe-regex-test@^1.1.0:
    es-errors "^1.3.0"
    is-regex "^1.2.1"

-sass@1.92.1:
-  version "1.92.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.92.1.tgz#07fb1fec5647d7b712685d1090628bf52456fe86"
-  integrity sha512-ffmsdbwqb3XeyR8jJR6KelIXARM9bFQe8A6Q3W4Klmwy5Ckd5gz7jgUNHo4UOqutU5Sk1DtKLbpDP0nLCg1xqQ==
+sass@1.93.2:
+  version "1.93.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.93.2.tgz#e97d225d60f59a3b3dbb6d2ae3c1b955fd1f2cd1"
+  integrity sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==
  dependencies:
    chokidar "^4.0.0"
    immutable "^5.0.2"
--- a/netbox/release.yaml
+++ b/netbox/release.yaml
@@ -1,3 +1,3 @@
-version: "4.4.1"
+version: "4.4.2"
 edition: "Community"
-published: "2025-09-16"
+published: "2025-09-30"
--- a/netbox/templates/account/base.html
+++ b/netbox/templates/account/base.html
@@ -18,7 +18,7 @@
    <li class="nav-item">
      <a class="nav-link{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'account:preferences' %}">{% trans "Preferences" %}</a>
    </li>
-    {% if not request.user.ldap_username %}
+    {% if request.user.has_usable_password %}
      <li class="nav-item">
        <a class="nav-link{% if active_tab == 'password' %} active{% endif %}" href="{% url 'account:change_password' %}">{% trans "Password" %}</a>
      </li>
--- a/netbox/templates/extras/htmx/script_result.html
+++ b/netbox/templates/extras/htmx/script_result.html
@@ -44,8 +44,8 @@
        <div class="htmx-container table-responsive"
          hx-get="{% url 'extras:script_result' job_pk=job.pk %}?embedded=True&log=True&log_threshold={{log_threshold}}"
          hx-target="this"
-          hx-trigger="load" hx-select=".htmx-container" hx-swap="outerHTML"
-        ></div>
+          hx-trigger="load" hx-select=".htmx-container" hx-swap="outerHTML">
+        </div>
      </div>
    </div>
    {% endif %}
@@ -60,11 +60,12 @@
              <a href="?export=output" class="btn btn-sm btn-primary" role="button">
                <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
              </a>
+              {% copy_content "job_data_output" %}
            </div>
          {% endif %}
        </h2>
        {% if job.data.output %}
-          <pre class="card-body font-monospace">{{ job.data.output }}</pre>
+          <pre class="card-body font-monospace" id="job_data_output">{{ job.data.output }}</pre>
        {% else %}
          <div class="card-body text-muted">{% trans "None" %}</div>
        {% endif %}
--- a/netbox/templates/extras/savedfilter.html
+++ b/netbox/templates/extras/savedfilter.html
@@ -37,20 +37,24 @@
    </div>
    <div class="card">
      <h2 class="card-header">{% trans "Assigned Models" %}</h2>
-      <table class="table table-hover attr-table">
+      <div class="list-group list-group-flush" role="presentation">
        {% for object_type in object.object_types.all %}
-          <tr>
-            <td>{{ object_type }}</td>
-          </tr>
+          {% with object_type.model_class|validated_viewname:"list" as viewname %}
+            {% if viewname %}
+              <a href="{% url viewname %}?{{ object.url_params }}" class="list-group-item list-group-item-action">{{ object_type }}</a>
+            {% else %}
+              <div class="list-group-item list-group-item-action">{{ object_type }}</div>
+            {% endif %}
+          {% endwith %}
        {% endfor %}
-      </table>
+      </div>
    </div>
    {% plugin_left_page object %}
 	</div>
 	<div class="col col-12 col-md-7">
    <div class="card">
      <h2 class="card-header">{% trans "Parameters" %}</h2>
-      <div class="card-body">
+      <div class="card-body p-0">
        <pre>{{ object.parameters|json }}</pre>
      </div>
    </div>
--- a/netbox/tenancy/forms/bulk_import.py
+++ b/netbox/tenancy/forms/bulk_import.py
@@ -1,3 +1,4 @@
+from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext_lazy as _

@@ -25,7 +26,7 @@ class TenantGroupImportForm(NetBoxModelImportForm):
        queryset=TenantGroup.objects.all(),
        required=False,
        to_field_name='name',
-        help_text=_('Parent group')
+        help_text=_('Parent group'),
    )
    slug = SlugField()

@@ -41,7 +42,7 @@ class TenantImportForm(NetBoxModelImportForm):
        queryset=TenantGroup.objects.all(),
        required=False,
        to_field_name='name',
-        help_text=_('Assigned group')
+        help_text=_('Assigned group'),
    )

    class Meta:
@@ -59,7 +60,7 @@ class ContactGroupImportForm(NetBoxModelImportForm):
        queryset=ContactGroup.objects.all(),
        required=False,
        to_field_name='name',
-        help_text=_('Parent group')
+        help_text=_('Parent group'),
    )
    slug = SlugField()

@@ -81,7 +82,12 @@ class ContactImportForm(NetBoxModelImportForm):
        queryset=ContactGroup.objects.all(),
        required=False,
        to_field_name='name',
-        help_text=_('Group names separated by commas, encased with double quotes (e.g. "Group 1,Group 2")')
+        help_text=_('Group names separated by commas, encased with double quotes (e.g. "Group 1,Group 2")'),
+    )
+    link = forms.URLField(
+        label=_('Link'),
+        assume_scheme='https',
+        required=False,
    )

    class Meta:
--- a/netbox/tenancy/forms/model_forms.py
+++ b/netbox/tenancy/forms/model_forms.py
@@ -100,6 +100,11 @@ class ContactForm(NetBoxModelForm):
        queryset=ContactGroup.objects.all(),
        required=False
    )
+    link = forms.URLField(
+        label=_('Link'),
+        assume_scheme='https',
+        required=False,
+    )
    comments = CommentField()

    fieldsets = (
--- a/netbox/tenancy/tables/contacts.py
+++ b/netbox/tenancy/tables/contacts.py
@@ -110,10 +110,10 @@ class ContactAssignmentTable(NetBoxTable):
        verbose_name=_('Role'),
        linkify=True
    )
-    contact_group = tables.Column(
-        accessor=Accessor('contact__group'),
-        verbose_name=_('Group'),
-        linkify=True
+    contact_groups = columns.ManyToManyColumn(
+        accessor=Accessor('contact__groups'),
+        verbose_name=_('Groups'),
+        linkify_item=('tenancy:contactgroup', {'pk': tables.A('pk')})
    )
    contact_title = tables.Column(
        accessor=Accessor('contact__title'),
@@ -152,7 +152,7 @@ class ContactAssignmentTable(NetBoxTable):
        model = ContactAssignment
        fields = (
            'pk', 'object_type', 'object', 'contact', 'role', 'priority', 'contact_title', 'contact_phone',
-            'contact_email', 'contact_address', 'contact_link', 'contact_description', 'contact_group', 'tags',
+            'contact_email', 'contact_address', 'contact_link', 'contact_description', 'contact_groups', 'tags',
            'actions'
        )
        default_columns = (
--- a/netbox/translations/cs/LC_MESSAGES/django.mo
+++ b/netbox/translations/cs/LC_MESSAGES/django.mo
--- a/netbox/translations/cs/LC_MESSAGES/django.po
+++ b/netbox/translations/cs/LC_MESSAGES/django.po
--- a/netbox/translations/da/LC_MESSAGES/django.mo
+++ b/netbox/translations/da/LC_MESSAGES/django.mo
--- a/netbox/translations/da/LC_MESSAGES/django.po
+++ b/netbox/translations/da/LC_MESSAGES/django.po
--- a/netbox/translations/de/LC_MESSAGES/django.mo
+++ b/netbox/translations/de/LC_MESSAGES/django.mo
--- a/netbox/translations/de/LC_MESSAGES/django.po
+++ b/netbox/translations/de/LC_MESSAGES/django.po
--- a/netbox/translations/en/LC_MESSAGES/django.po
+++ b/netbox/translations/en/LC_MESSAGES/django.po
--- a/netbox/translations/es/LC_MESSAGES/django.mo
+++ b/netbox/translations/es/LC_MESSAGES/django.mo
--- a/netbox/translations/es/LC_MESSAGES/django.po
+++ b/netbox/translations/es/LC_MESSAGES/django.po
--- a/netbox/translations/fr/LC_MESSAGES/django.mo
+++ b/netbox/translations/fr/LC_MESSAGES/django.mo
--- a/netbox/translations/fr/LC_MESSAGES/django.po
+++ b/netbox/translations/fr/LC_MESSAGES/django.po
--- a/netbox/translations/it/LC_MESSAGES/django.mo
+++ b/netbox/translations/it/LC_MESSAGES/django.mo
--- a/netbox/translations/it/LC_MESSAGES/django.po
+++ b/netbox/translations/it/LC_MESSAGES/django.po
--- a/netbox/translations/ja/LC_MESSAGES/django.mo
+++ b/netbox/translations/ja/LC_MESSAGES/django.mo
--- a/netbox/translations/ja/LC_MESSAGES/django.po
+++ b/netbox/translations/ja/LC_MESSAGES/django.po
--- a/netbox/translations/nl/LC_MESSAGES/django.mo
+++ b/netbox/translations/nl/LC_MESSAGES/django.mo
--- a/netbox/translations/nl/LC_MESSAGES/django.po
+++ b/netbox/translations/nl/LC_MESSAGES/django.po
--- a/netbox/translations/pl/LC_MESSAGES/django.mo
+++ b/netbox/translations/pl/LC_MESSAGES/django.mo
--- a/netbox/translations/pl/LC_MESSAGES/django.po
+++ b/netbox/translations/pl/LC_MESSAGES/django.po
--- a/netbox/translations/pt/LC_MESSAGES/django.mo
+++ b/netbox/translations/pt/LC_MESSAGES/django.mo
--- a/netbox/translations/pt/LC_MESSAGES/django.po
+++ b/netbox/translations/pt/LC_MESSAGES/django.po
--- a/netbox/translations/ru/LC_MESSAGES/django.mo
+++ b/netbox/translations/ru/LC_MESSAGES/django.mo
--- a/netbox/translations/ru/LC_MESSAGES/django.po
+++ b/netbox/translations/ru/LC_MESSAGES/django.po
--- a/netbox/translations/tr/LC_MESSAGES/django.mo
+++ b/netbox/translations/tr/LC_MESSAGES/django.mo
--- a/netbox/translations/tr/LC_MESSAGES/django.po
+++ b/netbox/translations/tr/LC_MESSAGES/django.po
--- a/netbox/translations/uk/LC_MESSAGES/django.mo
+++ b/netbox/translations/uk/LC_MESSAGES/django.mo
--- a/netbox/translations/uk/LC_MESSAGES/django.po
+++ b/netbox/translations/uk/LC_MESSAGES/django.po
--- a/netbox/translations/zh/LC_MESSAGES/django.mo
+++ b/netbox/translations/zh/LC_MESSAGES/django.mo
--- a/netbox/translations/zh/LC_MESSAGES/django.po
+++ b/netbox/translations/zh/LC_MESSAGES/django.po
--- a/netbox/utilities/data.py
+++ b/netbox/utilities/data.py
@@ -137,8 +137,17 @@ def check_ranges_overlap(ranges):

 def ranges_to_string(ranges):
    """
-    Generate a human-friendly string from a set of ranges. Intended for use with ArrayField. For example:
-        [[1, 100)], [200, 300)] => "1-99,200-299"
+    Converts a list of ranges into a string representation.
+
+    This function takes a list of range objects and produces a string
+    representation of those ranges. Each range is represented as a
+    hyphen-separated pair of lower and upper bounds, with inclusive or
+    exclusive bounds adjusted accordingly. If the lower and upper bounds
+    of a range are the same, only the single value is added to the string.
+    Intended for use with ArrayField.
+
+    Example:
+        [NumericRange(1, 5), NumericRange(8, 9), NumericRange(10, 12)] => "1-5,8,10-12"
    """
    if not ranges:
        return ''
@@ -146,15 +155,22 @@ def ranges_to_string(ranges):
    for r in ranges:
        lower = r.lower if r.lower_inc else r.lower + 1
        upper = r.upper if r.upper_inc else r.upper - 1
-        output.append(f'{lower}-{upper}')
+        output.append(f"{lower}-{upper}" if lower != upper else str(lower))
    return ','.join(output)


 def string_to_ranges(value):
    """
-    Given a string in the format "1-100, 200-300" return an list of NumericRanges. Intended for use with ArrayField.
-    For example:
-        "1-99,200-299" => [NumericRange(1, 100), NumericRange(200, 300)]
+    Converts a string representation of numeric ranges into a list of NumericRange objects.
+
+    This function parses a string containing numeric values and ranges separated by commas (e.g.,
+    "1-5,8,10-12") and converts it into a list of NumericRange objects.
+    In the case of a single integer, it is treated as a range where the start and end
+    are equal. The returned ranges are represented as half-open intervals [lower, upper).
+    Intended for use with ArrayField.
+
+    Example:
+        "1-5,8,10-12" => [NumericRange(1, 6), NumericRange(8, 9), NumericRange(10, 13)]
    """
    if not value:
        return None
@@ -172,5 +188,5 @@ def string_to_ranges(value):
            upper = dash_range[1]
        else:
            return None
-        values.append(NumericRange(int(lower), int(upper), bounds='[]'))
+        values.append(NumericRange(int(lower), int(upper) + 1, bounds='[)'))
    return values
--- a/netbox/utilities/forms/fields/fields.py
+++ b/netbox/utilities/forms/fields/fields.py
@@ -1,6 +1,7 @@
 import json

 from django import forms
+from django.conf import settings
 from django.db.models import Count
 from django.forms.fields import JSONField as _JSONField, InvalidJSONInput
 from django.templatetags.static import static
@@ -74,7 +75,8 @@ class TagFilterField(forms.MultipleChoiceField):
                count=Count('extras_taggeditem_items')
            ).order_by('name')
            return [
-                (str(tag.slug), '{} ({})'.format(tag.name, tag.count)) for tag in tags
+                (settings.FILTERS_NULL_CHOICE_VALUE, settings.FILTERS_NULL_CHOICE_LABEL),  # "None" option
+                *[(str(tag.slug), f'{tag.name} ({tag.count})') for tag in tags]
            ]

        # Choices are fetched each time the form is initialized
--- a/netbox/utilities/tests/test_api.py
+++ b/netbox/utilities/tests/test_api.py
@@ -149,14 +149,13 @@ class APIPaginationTestCase(APITestCase):
    def test_default_page_size_with_small_max_page_size(self):
        response = self.client.get(self.url, format='json', **self.header)
        page_size = get_config().MAX_PAGE_SIZE
-        paginate_count = get_config().PAGINATE_COUNT
        self.assertLess(page_size, 100, "Default page size not sufficient for data set")

        self.assertHttpStatus(response, status.HTTP_200_OK)
        self.assertEqual(response.data['count'], 100)
-        self.assertTrue(response.data['next'].endswith(f'?limit={paginate_count}&offset={paginate_count}'))
+        self.assertTrue(response.data['next'].endswith(f'?limit={page_size}&offset={page_size}'))
        self.assertIsNone(response.data['previous'])
-        self.assertEqual(len(response.data['results']), paginate_count)
+        self.assertEqual(len(response.data['results']), page_size)

    def test_custom_page_size(self):
        response = self.client.get(f'{self.url}?limit=10', format='json', **self.header)
--- a/netbox/utilities/tests/test_data.py
+++ b/netbox/utilities/tests/test_data.py
@@ -61,18 +61,18 @@ class RangeFunctionsTestCase(TestCase):
        self.assertEqual(
            string_to_ranges('10-19, 30-39, 100-199'),
            [
-                NumericRange(10, 19, bounds='[]'),    # 10-19
-                NumericRange(30, 39, bounds='[]'),    # 30-39
-                NumericRange(100, 199, bounds='[]'),  # 100-199
+                NumericRange(10, 20, bounds='[)'),    # 10-20
+                NumericRange(30, 40, bounds='[)'),    # 30-40
+                NumericRange(100, 200, bounds='[)'),  # 100-200
            ]
        )

        self.assertEqual(
            string_to_ranges('1-2, 5, 10-12'),
            [
-                NumericRange(1, 2, bounds='[]'),    # 1-2
-                NumericRange(5, 5, bounds='[]'),    # 5-5
-                NumericRange(10, 12, bounds='[]'),  # 10-12
+                NumericRange(1, 3, bounds='[)'),    # 1-3
+                NumericRange(5, 6, bounds='[)'),    # 5-6
+                NumericRange(10, 13, bounds='[)'),  # 10-13
            ]
        )

--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@

 [project]
 name = "netbox"
-version = "4.4.1"
+version = "4.4.2"
 requires-python = ">=3.10"
 description = "The premier source of truth powering network automation."
 readme = "README.md"
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,15 @@
 colorama==0.4.6
 Django==5.2.6
-django-cors-headers==4.8.0
+django-cors-headers==4.9.0
 django-debug-toolbar==5.2.0
 django-filter==25.1
 django-graphiql-debug-toolbar==0.2.0
-django-htmx==1.24.1
+django-htmx==1.26.0
 django-mptt==0.17.0
 django-pglocks==1.0.4
 django-prometheus==2.4.1
 django-redis==6.0.0
-django-rich==2.1.0
+django-rich==2.2.0
 django-rq==3.1
 django-storages==1.14.6
 django-tables2==2.7.5
@@ -24,13 +24,13 @@ Jinja2==3.1.6
 jsonschema==4.25.1
 Markdown==3.9
 mkdocs-material==9.6.20
-mkdocstrings==0.30.0
+mkdocstrings==0.30.1
 mkdocstrings-python==1.18.2
 netaddr==1.3.0
 nh3==0.3.0
 Pillow==11.3.0
 psycopg[c,pool]==3.2.10
-PyYAML==6.0.2
+PyYAML==6.0.3
 requests==2.32.5
 rq==2.6.0
 social-auth-app-django==5.5.1