Merge pull request #21562 from netbox-community/release-v4.5.4

Release v4.5.4
2026-03-06 06:20:04 +01:00 · 2026-03-03 15:07:18 -05:00 · 2026-03-03 12:46:15 -05:00 · 2026-03-03 18:35:36 +01:00 · 2026-03-03 12:01:33 -05:00 · 2026-03-03 08:26:44 -08:00
193 changed files with 53250 additions and 52582 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.5.3
+      placeholder: v4.5.4
    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.5.3
+      placeholder: v4.5.4
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/03-performance.yaml
+++ b/.github/ISSUE_TEMPLATE/03-performance.yaml
@@ -8,7 +8,7 @@ body:
    attributes:
      label: NetBox Version
      description: What version of NetBox are you currently running?
-      placeholder: v4.5.3
+      placeholder: v4.5.4
    validations:
      required: true
  - type: dropdown
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,13 @@ jobs:
    - name: Check out repo
      uses: actions/checkout@v4

+    - name: Check Python linting & PEP8 compliance
+      uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
+      with:
+        version: "0.15.2"
+        args: "check --output-format=github"
+        src: "netbox/"
+
    - name: Set up Python ${{ matrix.python-version }}
      uses: actions/setup-python@v5
      with:
@@ -82,7 +89,7 @@ jobs:
      run: |
        python -m pip install --upgrade pip
        pip install -r requirements.txt
-        pip install ruff coverage tblib
+        pip install coverage tblib

    - name: Build documentation
      run: mkdocs build
@@ -93,9 +100,6 @@ jobs:
    - name: Check for missing migrations
      run: python netbox/manage.py makemigrations --check

-    - name: Check PEP8 compliance
-      run: ruff check netbox/
-
    - name: Check UI ESLint, TypeScript, and Prettier Compliance
      run: yarn --cwd netbox/project-static validate
    
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -0,0 +1,44 @@
+name: Claude Code Review
+
+on:
+  pull_request:
+    types: [opened, synchronize, ready_for_review, reopened]
+    # Optional: Only run on specific file changes
+    # paths:
+    #   - "src/**/*.ts"
+    #   - "src/**/*.tsx"
+    #   - "src/**/*.js"
+    #   - "src/**/*.jsx"
+
+jobs:
+  claude-review:
+    # Optional: Filter by PR author
+    # if: |
+    #   github.event.pull_request.user.login == 'external-contributor' ||
+    #   github.event.pull_request.user.login == 'new-developer' ||
+    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code Review
+        id: claude-review
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
+          plugins: 'code-review@claude-code-plugins'
+          prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,50 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
+
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.1
+  rev: v0.15.2
  hooks:
    - id: ruff
      name: "Ruff linter"
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,84 @@
+# NetBox
+
+Network source-of-truth and infrastructure resource modeling (IRM) tool combining DCIM and IPAM. Built on Django + PostgreSQL + Redis.
+
+## Tech Stack
+- Python 3.12+ / Django / Django REST Framework
+- PostgreSQL (required), Redis (required for caching/queuing)
+- GraphQL via Strawberry, background jobs via RQ
+- Docs: MkDocs (in `docs/`)
+
+## Repository Layout
+- `netbox/` — Django project root; run all `manage.py` commands from here
+- `netbox/netbox/` — Core settings, URLs, WSGI entrypoint
+- `netbox/<app>/` — Django apps: `circuits`, `core`, `dcim`, `ipam`, `extras`, `tenancy`, `virtualization`, `wireless`, `users`, `vpn`
+- `docs/` — MkDocs documentation source
+- `contrib/` — Example configs (systemd, nginx, etc.) and other resources
+
+## Development Setup
+```bash
+python -m venv ~/.venv/netbox
+source ~/.venv/netbox/bin/activate
+pip install -r requirements.txt
+
+# Copy and configure
+cp netbox/netbox/configuration.example.py netbox/netbox/configuration.py
+# Edit configuration.py: set DATABASE, REDIS, SECRET_KEY, ALLOWED_HOSTS
+
+cd netbox/
+python manage.py migrate
+python manage.py runserver
+```
+
+## Key Commands
+All commands run from the `netbox/` subdirectory with venv active.
+
+```bash
+# Development server
+python manage.py runserver
+
+# Run full test suite
+export NETBOX_CONFIGURATION=netbox.configuration_testing
+python manage.py test
+
+# Faster test runs (no DB rebuild, parallel)
+python manage.py test --keepdb --parallel 4
+
+# Migrations
+python manage.py makemigrations
+python manage.py migrate
+
+# Shell
+python manage.py nbshell   # NetBox-enhanced shell
+```
+
+## Architecture Conventions
+- **Apps**: Each Django app owns its models, views, API serializers, filtersets, forms, and tests.
+- **REST API**: DRF serializers live in `<app>/api/serializers.py`; viewsets in `<app>/api/views.py`; URLs auto-registered in `<app>/api/urls.py`.
+- **GraphQL**: Strawberry types in `<app>/graphql/types.py`.
+- **Filtersets**: `<app>/filtersets.py` — used for both UI filtering and API `?filter=` params.
+- **Tables**: `django-tables2` used for all object list views (`<app>/tables.py`).
+- **Templates**: Django templates in `netbox/templates/<app>/`.
+- **Tests**: Mirror the app structure in `<app>/tests/`. Use `netbox.configuration_testing` for test config.
+
+## Coding Standards
+- Follow existing Django conventions; don't reinvent patterns already present in the codebase.
+- New models must include `created`, `last_updated` fields (inherit from `NetBoxModel` where appropriate).
+- Every model exposed in the UI needs: model, serializer, filterset, form, table, views, URL route, and tests.
+- API serializers must include a `url` field (absolute URL of the object).
+- Use `FeatureQuery` for generic relations (config contexts, custom fields, tags, etc.).
+- Avoid adding new dependencies without strong justification.
+
+## Branch & PR Conventions
+- Branch naming: `<issue-number>-short-description` (e.g., `1234-device-typerror`)
+- Use the `main` branch for patch releases; `feature` tracks work for the upcoming minor/major release.
+- Every PR must reference an approved GitHub issue.
+- PRs must include tests for new functionality.
+
+## Gotchas
+- `configuration.py` is gitignored — never commit it.
+- `manage.py` lives in `netbox/`, NOT the repo root. Running from the wrong directory is a common mistake.
+- `NETBOX_CONFIGURATION` env var controls which settings module loads; set to `netbox.configuration_testing` for tests.
+- The `extras` app is a catch-all for cross-cutting features (custom fields, tags, webhooks, scripts).
+- Plugins API: only documented public APIs are stable. Internal NetBox code is subject to change without notice.
+- See `docs/development/` for the full contributing guide and code style details.
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -98,6 +98,10 @@ jsonschema
 # https://python-markdown.github.io/changelog/
 Markdown

+# MkDocs
+# https://github.com/mkdocs/mkdocs/releases
+mkdocs<2.0
+
 # MkDocs Material theme (for documentation build)
 # https://squidfunk.github.io/mkdocs-material/changelog/
 mkdocs-material
@@ -157,8 +161,7 @@ strawberry-graphql

 # Strawberry GraphQL Django extension
 # https://github.com/strawberry-graphql/strawberry-django/releases
-# Blocked by #21450
-strawberry-graphql-django==0.75.0
+strawberry-graphql-django

 # SVG image rendering (used for rack elevations)
 # https://github.com/mozman/svgwrite/blob/master/NEWS.rst
--- a/contrib/generated_schema.json
+++ b/contrib/generated_schema.json
@@ -349,6 +349,7 @@
                        "5gbase-t",
                        "10gbase-br-d",
                        "10gbase-br-u",
+                        "10gbase-cu",
                        "10gbase-cx4",
                        "10gbase-er",
                        "10gbase-lr",
@@ -367,6 +368,7 @@
                        "40gbase-fr4",
                        "40gbase-lr4",
                        "40gbase-sr4",
+                        "40gbase-sr4-bd",
                        "50gbase-cr",
                        "50gbase-er",
                        "50gbase-fr",
--- a/contrib/openapi.json
+++ b/contrib/openapi.json
--- a/docs/development/release-checklist.md
+++ b/docs/development/release-checklist.md
@@ -168,6 +168,14 @@ Update the static OpenAPI schema definition at `contrib/openapi.json` with the m
 ./manage.py spectacular --format openapi-json > ../contrib/openapi.json
 ```

+### Update Development Dependencies
+
+Keep development tooling versions consistent across the project. If you upgrade a dev-only dependency, update all places where it’s pinned so local tooling and CI run the same versions.
+
+* Ruff:
+  * `.pre-commit-config.yaml`
+  * `.github/workflows/ci.yml`
+
 ### Submit a Pull Request

 Commit the above changes and submit a pull request titled **"Release vX.Y.Z"** to merge the current release branch (e.g. `release-vX.Y.Z`) into `main`. Copy the documented release notes into the pull request's body.
--- a/docs/development/style-guide.md
+++ b/docs/development/style-guide.md
@@ -34,7 +34,8 @@ The following rules are ignored when linting.

 ##### [E501](https://docs.astral.sh/ruff/rules/line-too-long/): Line too long

-NetBox does not enforce a hard restriction on line length, although a maximum length of 120 characters is strongly encouraged for Python code where possible. The maximum length does not apply to HTML templates or to automatically generated code (e.g. database migrations).
+NetBox enforces a maximum line length of 120 characters for Python code using Ruff (E501).
+The maximum length does not apply to HTML templates or to automatically generated code (e.g. database migrations).

 ##### [F403](https://docs.astral.sh/ruff/rules/undefined-local-with-import-star/): Undefined local with import star

@@ -47,6 +48,14 @@ Wildcard imports (for example, `from .constants import *`) are acceptable under

 The justification for ignoring this rule is the same as F403 above.

+##### [RET504](https://docs.astral.sh/ruff/rules/unnecessary-assign/): Unnecessary assign
+
+There are multiple instances where it is more readable and clearer to first assign to a variable and then return it.
+
+##### [UP032](https://docs.astral.sh/ruff/rules/f-string/): f-string
+
+For localizable strings, it is necessary to not use the `f-string` syntax, as Django's translation functions (e.g. `gettext_lazy`) require plain string literals.
+
 ### Introducing New Dependencies

 The introduction of a new dependency is best avoided unless it is absolutely necessary. For small features, it's generally preferable to replicate functionality within the NetBox code base rather than to introduce reliance on an external project. This reduces both the burden of tracking new releases and our exposure to outside bugs and supply chain attacks.
--- a/docs/release-notes/version-4.5.md
+++ b/docs/release-notes/version-4.5.md
@@ -1,5 +1,34 @@
 # NetBox v4.5

+## v4.5.4 (2026-03-03)
+
+### Enhancements
+
+* [#21369](https://github.com/netbox-community/netbox/issues/21369) - Support lazy-loading of image attachments
+* [#21385](https://github.com/netbox-community/netbox/issues/21385) - Add contact assignment support for virtual circuits
+* [#21394](https://github.com/netbox-community/netbox/issues/21394) - Add 10GBASE-CU and 40GBASE-SR4 BiDi interface types
+* [#21477](https://github.com/netbox-community/netbox/issues/21477) - Extend GraphQL API filters for cables
+
+### Performance Improvements
+
+* [#21456](https://github.com/netbox-community/netbox/issues/21456) - Improve performance of config context resolution via GraphQL API
+* [#21459](https://github.com/netbox-community/netbox/issues/21459) - Avoid prefetching data for hidden table columns
+
+### Bug Fixes
+
+* [#20490](https://github.com/netbox-community/netbox/issues/20490) - Restrict visibility of scripts in list view to users with view permission
+* [#20911](https://github.com/netbox-community/netbox/issues/20911) - Sort module bay options alphabetically when installing a module
+* [#21347](https://github.com/netbox-community/netbox/issues/21347) - The allocation of IPv6 addresses from a non-pool prefix should start at one, not zero
+* [#21429](https://github.com/netbox-community/netbox/issues/21429) - Termination type should persist when employing "create & add another" workflow for cables
+* [#21478](https://github.com/netbox-community/netbox/issues/21478) - Fix GraphQL union type resolution for connected console ports
+* [#21481](https://github.com/netbox-community/netbox/issues/21481) - Fix display of facility ID on rack view
+* [#21518](https://github.com/netbox-community/netbox/issues/21518) - Fix decimal custom field displaying as unset when value is zero
+* [#21524](https://github.com/netbox-community/netbox/issues/21524) - Avoid `IndexError` exception when encountering stale cable paths
+* [#21527](https://github.com/netbox-community/netbox/issues/21527) - Fix display of primary IP address with associated NAT IP on device view
+* [#21550](https://github.com/netbox-community/netbox/issues/21550) - Ensure pre-change snapshots are recorded for related objects
+
+---
+
 ## v4.5.3 (2026-02-17)

 ### Enhancements
--- a/netbox/circuits/api/serializers_/circuits.py
+++ b/netbox/circuits/api/serializers_/circuits.py
@@ -29,9 +29,9 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer

 __all__ = (
-    'CircuitSerializer',
    'CircuitGroupAssignmentSerializer',
    'CircuitGroupSerializer',
+    'CircuitSerializer',
    'CircuitTerminationSerializer',
    'CircuitTypeSerializer',
    'VirtualCircuitSerializer',
--- a/netbox/circuits/filtersets.py
+++ b/netbox/circuits/filtersets.py
@@ -25,9 +25,9 @@ __all__ = (
    'CircuitGroupFilterSet',
    'CircuitTerminationFilterSet',
    'CircuitTypeFilterSet',
-    'ProviderNetworkFilterSet',
    'ProviderAccountFilterSet',
    'ProviderFilterSet',
+    'ProviderNetworkFilterSet',
    'VirtualCircuitFilterSet',
    'VirtualCircuitTerminationFilterSet',
    'VirtualCircuitTypeFilterSet',
--- a/netbox/circuits/forms/bulk_edit.py
+++ b/netbox/circuits/forms/bulk_edit.py
@@ -33,8 +33,8 @@ __all__ = (
    'CircuitGroupBulkEditForm',
    'CircuitTerminationBulkEditForm',
    'CircuitTypeBulkEditForm',
-    'ProviderBulkEditForm',
    'ProviderAccountBulkEditForm',
+    'ProviderBulkEditForm',
    'ProviderNetworkBulkEditForm',
    'VirtualCircuitBulkEditForm',
    'VirtualCircuitTerminationBulkEditForm',
--- a/netbox/circuits/forms/bulk_import.py
+++ b/netbox/circuits/forms/bulk_import.py
@@ -12,14 +12,14 @@ from tenancy.models import Tenant
 from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField

 __all__ = (
-    'CircuitImportForm',
    'CircuitGroupAssignmentImportForm',
    'CircuitGroupImportForm',
+    'CircuitImportForm',
    'CircuitTerminationImportForm',
    'CircuitTerminationImportRelatedForm',
    'CircuitTypeImportForm',
-    'ProviderImportForm',
    'ProviderAccountImportForm',
+    'ProviderImportForm',
    'ProviderNetworkImportForm',
    'VirtualCircuitImportForm',
    'VirtualCircuitTerminationImportForm',
--- a/netbox/circuits/forms/filtersets.py
+++ b/netbox/circuits/forms/filtersets.py
@@ -25,8 +25,8 @@ __all__ = (
    'CircuitGroupFilterForm',
    'CircuitTerminationFilterForm',
    'CircuitTypeFilterForm',
-    'ProviderFilterForm',
    'ProviderAccountFilterForm',
+    'ProviderFilterForm',
    'ProviderNetworkFilterForm',
    'VirtualCircuitFilterForm',
    'VirtualCircuitTerminationFilterForm',
--- a/netbox/circuits/forms/model_forms.py
+++ b/netbox/circuits/forms/model_forms.py
@@ -32,8 +32,8 @@ __all__ = (
    'CircuitGroupForm',
    'CircuitTerminationForm',
    'CircuitTypeForm',
-    'ProviderForm',
    'ProviderAccountForm',
+    'ProviderForm',
    'ProviderNetworkForm',
    'VirtualCircuitForm',
    'VirtualCircuitTerminationForm',
--- a/netbox/circuits/graphql/enums.py
+++ b/netbox/circuits/graphql/enums.py
@@ -3,9 +3,9 @@ import strawberry
 from circuits.choices import *

 __all__ = (
+    'CircuitPriorityEnum',
    'CircuitStatusEnum',
    'CircuitTerminationSideEnum',
-    'CircuitPriorityEnum',
    'VirtualCircuitTerminationRoleEnum',
 )

--- a/netbox/circuits/graphql/filters.py
+++ b/netbox/circuits/graphql/filters.py
@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Annotated
 import strawberry
 import strawberry_django
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, DateFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, DateFilterLookup, StrFilterLookup

 from circuits import models
 from circuits.graphql.filter_mixins import CircuitTypeFilterMixin
@@ -28,8 +28,8 @@ __all__ = (
    'CircuitGroupFilter',
    'CircuitTerminationFilter',
    'CircuitTypeFilter',
-    'ProviderFilter',
    'ProviderAccountFilter',
+    'ProviderFilter',
    'ProviderNetworkFilter',
    'VirtualCircuitFilter',
    'VirtualCircuitTerminationFilter',
@@ -62,9 +62,9 @@ class CircuitTerminationFilter(
    upstream_speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    xconnect_id: FilterLookup[str] | None = strawberry_django.filter_field()
-    pp_info: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    xconnect_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    pp_info: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()

    # Cached relations
    _provider_network: Annotated['ProviderNetworkFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
@@ -92,7 +92,7 @@ class CircuitFilter(
    TenancyFilterMixin,
    PrimaryModelFilter
 ):
-    cid: FilterLookup[str] | None = strawberry_django.filter_field()
+    cid: StrFilterLookup[str] | None = strawberry_django.filter_field()
    provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -145,8 +145,8 @@ class CircuitGroupAssignmentFilter(CustomFieldsFilterMixin, TagsFilterMixin, Cha

@strawberry_django.filter_type(models.Provider, lookups=True)
 class ProviderFilter(ContactFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    asns: Annotated['ASNFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
    circuits: Annotated['CircuitFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
        strawberry_django.filter_field()
@@ -159,18 +159,18 @@ class ProviderAccountFilter(ContactFilterMixin, PrimaryModelFilter):
        strawberry_django.filter_field()
    )
    provider_id: ID | None = strawberry_django.filter_field()
-    account: FilterLookup[str] | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    account: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.ProviderNetwork, lookups=True)
 class ProviderNetworkFilter(PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
    provider_id: ID | None = strawberry_django.filter_field()
-    service_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    service_id: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.VirtualCircuitType, lookups=True)
@@ -180,7 +180,7 @@ class VirtualCircuitTypeFilter(CircuitTypeFilterMixin, OrganizationalModelFilter

@strawberry_django.filter_type(models.VirtualCircuit, lookups=True)
 class VirtualCircuitFilter(TenancyFilterMixin, PrimaryModelFilter):
-    cid: FilterLookup[str] | None = strawberry_django.filter_field()
+    cid: StrFilterLookup[str] | None = strawberry_django.filter_field()
    provider_network: Annotated['ProviderNetworkFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -218,4 +218,4 @@ class VirtualCircuitTerminationFilter(CustomFieldsFilterMixin, TagsFilterMixin,
        strawberry_django.filter_field()
    )
    interface_id: ID | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
--- a/netbox/circuits/graphql/types.py
+++ b/netbox/circuits/graphql/types.py
@@ -21,9 +21,9 @@ __all__ = (
    'CircuitTerminationType',
    'CircuitType',
    'CircuitTypeType',
-    'ProviderType',
    'ProviderAccountType',
    'ProviderNetworkType',
+    'ProviderType',
    'VirtualCircuitTerminationType',
    'VirtualCircuitType',
    'VirtualCircuitTypeType',
@@ -177,7 +177,7 @@ class VirtualCircuitTerminationType(CustomFieldsMixin, TagsMixin, ObjectType):
    filters=VirtualCircuitFilter,
    pagination=True
 )
-class VirtualCircuitType(PrimaryObjectType):
+class VirtualCircuitType(ContactsMixin, PrimaryObjectType):
    provider_network: ProviderNetworkType = strawberry_django.field(select_related=["provider_network"])
    provider_account: ProviderAccountType | None
    type: Annotated["VirtualCircuitTypeType", strawberry.lazy('circuits.graphql.types')] = strawberry_django.field(
--- a/netbox/circuits/models/providers.py
+++ b/netbox/circuits/models/providers.py
@@ -6,9 +6,9 @@ from netbox.models import PrimaryModel
 from netbox.models.features import ContactsMixin

 __all__ = (
-    'ProviderNetwork',
    'Provider',
    'ProviderAccount',
+    'ProviderNetwork',
 )


--- a/netbox/circuits/models/virtual_circuits.py
+++ b/netbox/circuits/models/virtual_circuits.py
@@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _

 from circuits.choices import *
 from netbox.models import ChangeLoggedModel, PrimaryModel
-from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, TagsMixin
+from netbox.models.features import ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, TagsMixin

 from .base import BaseCircuitType

@@ -30,7 +30,7 @@ class VirtualCircuitType(BaseCircuitType):
        verbose_name_plural = _('virtual circuit types')


-class VirtualCircuit(PrimaryModel):
+class VirtualCircuit(ContactsMixin, PrimaryModel):
    """
    A virtual connection between two or more endpoints, delivered across one or more physical circuits.
    """
--- a/netbox/circuits/tables/providers.py
+++ b/netbox/circuits/tables/providers.py
@@ -7,9 +7,9 @@ from netbox.tables import PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin

 __all__ = (
-    'ProviderTable',
    'ProviderAccountTable',
    'ProviderNetworkTable',
+    'ProviderTable',
 )


--- a/netbox/circuits/tables/virtual_circuits.py
+++ b/netbox/circuits/tables/virtual_circuits.py
@@ -71,7 +71,7 @@ class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModel
        model = VirtualCircuit
        fields = (
            'pk', 'id', 'cid', 'provider', 'provider_account', 'provider_network', 'type', 'status', 'tenant',
-            'tenant_group', 'description', 'comments', 'tags', 'created', 'last_updated',
+            'tenant_group', 'description', 'comments', 'contacts', 'tags', 'created', 'last_updated',
        )
        default_columns = (
            'pk', 'cid', 'provider', 'provider_account', 'provider_network', 'type', 'status', 'tenant',
--- a/netbox/core/api/schema.py
+++ b/netbox/core/api/schema.py
@@ -2,6 +2,7 @@ import re
 import typing
 from collections import OrderedDict

+from drf_spectacular.contrib.django_filters import DjangoFilterExtension
 from drf_spectacular.extensions import OpenApiSerializerExtension, OpenApiSerializerFieldExtension, _SchemaType
 from drf_spectacular.openapi import AutoSchema
 from drf_spectacular.plumbing import (
@@ -9,6 +10,7 @@ from drf_spectacular.plumbing import (
    build_choice_field,
    build_media_type_object,
    build_object_type,
+    follow_field_source,
    get_doc,
 )
 from drf_spectacular.types import OpenApiTypes
@@ -23,6 +25,29 @@ BULK_ACTIONS = ("bulk_destroy", "bulk_partial_update", "bulk_update")
 WRITABLE_ACTIONS = ("PATCH", "POST", "PUT")


+class NetBoxDjangoFilterExtension(DjangoFilterExtension):
+    """
+    Overrides drf-spectacular's DjangoFilterExtension to fix a regression in v0.29.0 where
+    _get_model_field() incorrectly double-appends to_field_name when field_name already ends
+    with that value (e.g. field_name='tags__slug', to_field_name='slug' produces the invalid
+    path ['tags', 'slug', 'slug']). This caused hundreds of spurious warnings during schema
+    generation for filters such as TagFilter, TenancyFilterSet.tenant, and OwnerFilterMixin.owner.
+
+    See: https://github.com/netbox-community/netbox/issues/20787
+         https://github.com/tfranzel/drf-spectacular/issues/1475
+    """
+    priority = 1
+
+    def _get_model_field(self, filter_field, model):
+        if not filter_field.field_name:
+            return None
+        path = filter_field.field_name.split('__')
+        to_field_name = filter_field.extra.get('to_field_name')
+        if to_field_name is not None and path[-1] != to_field_name:
+            path.append(to_field_name)
+        return follow_field_source(model, path, emit_warnings=False)
+
+
 class FixTimeZoneSerializerField(OpenApiSerializerFieldExtension):
    target_class = 'timezone_field.rest_framework.TimeZoneSerializerField'

--- a/netbox/core/api/serializers_/tasks.py
+++ b/netbox/core/api/serializers_/tasks.py
@@ -2,8 +2,8 @@ from rest_framework import serializers
 from rest_framework.reverse import reverse

 __all__ = (
-    'BackgroundTaskSerializer',
    'BackgroundQueueSerializer',
+    'BackgroundTaskSerializer',
    'BackgroundWorkerSerializer',
 )

--- a/netbox/core/graphql/filters.py
+++ b/netbox/core/graphql/filters.py
@@ -5,7 +5,7 @@ import strawberry
 import strawberry_django
 from django.contrib.contenttypes.models import ContentType as DjangoContentType
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup, StrFilterLookup

 from core import models
 from netbox.graphql.filters import BaseModelFilter, PrimaryModelFilter
@@ -17,10 +17,10 @@ if TYPE_CHECKING:
    from users.graphql.filters import UserFilter

 __all__ = (
+    'ContentTypeFilter',
    'DataFileFilter',
    'DataSourceFilter',
    'ObjectChangeFilter',
-    'ContentTypeFilter',
 )


@@ -32,23 +32,23 @@ class DataFileFilter(BaseModelFilter):
        strawberry_django.filter_field()
    )
    source_id: ID | None = strawberry_django.filter_field()
-    path: FilterLookup[str] | None = strawberry_django.filter_field()
+    path: StrFilterLookup[str] | None = strawberry_django.filter_field()
    size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    hash: FilterLookup[str] | None = strawberry_django.filter_field()
+    hash: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.DataSource, lookups=True)
 class DataSourceFilter(PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    type: FilterLookup[str] | None = strawberry_django.filter_field()
-    source_url: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    type: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    source_url: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: (
        BaseFilterLookup[Annotated['DataSourceStatusEnum', strawberry.lazy('core.graphql.enums')]] | None
    ) = strawberry_django.filter_field()
    enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
-    ignore_rules: FilterLookup[str] | None = strawberry_django.filter_field()
+    ignore_rules: StrFilterLookup[str] | None = strawberry_django.filter_field()
    parameters: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -62,8 +62,8 @@ class DataSourceFilter(PrimaryModelFilter):
 class ObjectChangeFilter(BaseModelFilter):
    time: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
    user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
-    user_name: FilterLookup[str] | None = strawberry_django.filter_field()
-    request_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    user_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    request_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
    action: (
        BaseFilterLookup[Annotated['ObjectChangeActionEnum', strawberry.lazy('core.graphql.enums')]] | None
    ) = strawberry_django.filter_field()
@@ -76,7 +76,7 @@ class ObjectChangeFilter(BaseModelFilter):
        strawberry_django.filter_field()
    )
    related_object_id: ID | None = strawberry_django.filter_field()
-    object_repr: FilterLookup[str] | None = strawberry_django.filter_field()
+    object_repr: StrFilterLookup[str] | None = strawberry_django.filter_field()
    prechange_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -87,5 +87,5 @@ class ObjectChangeFilter(BaseModelFilter):

@strawberry_django.filter_type(DjangoContentType, lookups=True)
 class ContentTypeFilter(BaseModelFilter):
-    app_label: FilterLookup[str] | None = strawberry_django.filter_field()
-    model: FilterLookup[str] | None = strawberry_django.filter_field()
+    app_label: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    model: StrFilterLookup[str] | None = strawberry_django.filter_field()
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -684,7 +684,7 @@ class PluginListView(BasePluginView):

        plugins = [plugin for plugin in plugins if not plugin.hidden]

-        table = CatalogPluginTable(plugins, user=request.user)
+        table = CatalogPluginTable(plugins)
        table.configure(request)

        # If this is an HTMX request, return only the rendered table HTML
@@ -707,7 +707,7 @@ class PluginView(BasePluginView):
            raise Http404(_("Plugin {name} not found").format(name=name))
        plugin = plugins[name]

-        table = PluginVersionTable(plugin.release_recent_history, user=request.user)
+        table = PluginVersionTable(plugin.release_recent_history)
        table.configure(request)

        return render(request, 'core/plugin.html', {
--- a/netbox/dcim/api/serializers_/cables.py
+++ b/netbox/dcim/api/serializers_/cables.py
@@ -84,6 +84,9 @@ class CablePathSerializer(serializers.ModelSerializer):
    def get_path(self, obj):
        ret = []
        for nodes in obj.path_objects:
+            if not nodes:
+                # The path contains an invalid object
+                return []
            serializer = get_serializer_for_model(nodes[0])
            context = {'request': self.context['request']}
            ret.append(serializer(nodes, nested=True, many=True, context=context).data)
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -921,6 +921,7 @@ class InterfaceTypeChoices(ChoiceSet):
    # 10 Gbps Ethernet
    TYPE_10GE_BR_D = '10gbase-br-d'
    TYPE_10GE_BR_U = '10gbase-br-u'
+    TYPE_10GE_CU = '10gbase-cu'
    TYPE_10GE_CX4 = '10gbase-cx4'
    TYPE_10GE_ER = '10gbase-er'
    TYPE_10GE_LR = '10gbase-lr'
@@ -943,6 +944,7 @@ class InterfaceTypeChoices(ChoiceSet):
    TYPE_40GE_FR4 = '40gbase-fr4'
    TYPE_40GE_LR4 = '40gbase-lr4'
    TYPE_40GE_SR4 = '40gbase-sr4'
+    TYPE_40GE_SR4_BD = '40gbase-sr4-bd'

    # 50 Gbps Ethernet
    TYPE_50GE_CR = '50gbase-cr'
@@ -1192,6 +1194,7 @@ class InterfaceTypeChoices(ChoiceSet):
            (
                (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
                (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
+                (TYPE_10GE_CU, '10GBASE-CU (10GE DAC Passive Twinax)'),
                (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
                (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
                (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
@@ -1220,6 +1223,7 @@ class InterfaceTypeChoices(ChoiceSet):
                (TYPE_40GE_FR4, '40GBASE-FR4 (40GE)'),
                (TYPE_40GE_LR4, '40GBASE-LR4 (40GE)'),
                (TYPE_40GE_SR4, '40GBASE-SR4 (40GE)'),
+                (TYPE_40GE_SR4_BD, '40GBASE-SR4 (40GE BiDi)'),
            )
        ),
        (
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -46,8 +46,8 @@ from .models import *

 __all__ = (
    'CableFilterSet',
-    'CabledObjectFilterSet',
    'CableTerminationFilterSet',
+    'CabledObjectFilterSet',
    'CommonInterfaceFilterSet',
    'ConsoleConnectionFilterSet',
    'ConsolePortFilterSet',
--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@@ -48,9 +48,9 @@ __all__ = (
    'LocationBulkEditForm',
    'MACAddressBulkEditForm',
    'ManufacturerBulkEditForm',
-    'ModuleBulkEditForm',
    'ModuleBayBulkEditForm',
    'ModuleBayTemplateBulkEditForm',
+    'ModuleBulkEditForm',
    'ModuleTypeBulkEditForm',
    'ModuleTypeProfileBulkEditForm',
    'PlatformBulkEditForm',
--- a/netbox/dcim/forms/bulk_import.py
+++ b/netbox/dcim/forms/bulk_import.py
@@ -48,8 +48,8 @@ __all__ = (
    'LocationImportForm',
    'MACAddressImportForm',
    'ManufacturerImportForm',
-    'ModuleImportForm',
    'ModuleBayImportForm',
+    'ModuleImportForm',
    'ModuleTypeImportForm',
    'ModuleTypeProfileImportForm',
    'PlatformImportForm',
@@ -63,8 +63,8 @@ __all__ = (
    'RackTypeImportForm',
    'RearPortImportForm',
    'RegionImportForm',
-    'SiteImportForm',
    'SiteGroupImportForm',
+    'SiteImportForm',
    'VirtualChassisImportForm',
    'VirtualDeviceContextImportForm'
 )
@@ -1386,6 +1386,7 @@ class MACAddressImportForm(PrimaryModelImportForm):

        # Assign the MAC address as primary for its interface, if designated as such
        if interface and self.cleaned_data['is_primary'] and self.instance.pk:
+            interface.snapshot()
            interface.primary_mac_address = self.instance
            interface.save()

--- a/netbox/dcim/forms/connections.py
+++ b/netbox/dcim/forms/connections.py
@@ -15,6 +15,10 @@ def get_cable_form(a_type, b_type):

        def __new__(mcs, name, bases, attrs):

+            # NOTE: Cable.clone() mirrors the parent selector mapping below:
+            # termination_{end}_device / termination_{end}_powerpanel / termination_{end}_circuit
+            # This supports both the "Clone" and "Create & Add Another" workflows.
+            # If you change the mapping here, update Cable.clone() accordingly.
            for cable_end, term_cls in (('a', a_type), ('b', b_type)):

                # Device component
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -44,14 +44,14 @@ __all__ = (
    'InterfaceFilterForm',
    'InterfaceTemplateFilterForm',
    'InventoryItemFilterForm',
-    'InventoryItemTemplateFilterForm',
    'InventoryItemRoleFilterForm',
+    'InventoryItemTemplateFilterForm',
    'LocationFilterForm',
    'MACAddressFilterForm',
    'ManufacturerFilterForm',
-    'ModuleFilterForm',
    'ModuleBayFilterForm',
    'ModuleBayTemplateFilterForm',
+    'ModuleFilterForm',
    'ModuleTypeFilterForm',
    'ModuleTypeProfileFilterForm',
    'PlatformFilterForm',
@@ -62,8 +62,8 @@ __all__ = (
    'PowerPanelFilterForm',
    'PowerPortFilterForm',
    'PowerPortTemplateFilterForm',
-    'RackFilterForm',
    'RackElevationFilterForm',
+    'RackFilterForm',
    'RackReservationFilterForm',
    'RackRoleFilterForm',
    'RackTypeFilterForm',
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -60,9 +60,9 @@ __all__ = (
    'LocationForm',
    'MACAddressForm',
    'ManufacturerForm',
-    'ModuleForm',
    'ModuleBayForm',
    'ModuleBayTemplateForm',
+    'ModuleForm',
    'ModuleTypeForm',
    'ModuleTypeProfileForm',
    'PlatformForm',
@@ -755,7 +755,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
        label=_('Module bay'),
        queryset=ModuleBay.objects.all(),
        query_params={
-            'device_id': '$device'
+            'device_id': '$device',
        },
        context={
            'disabled': 'installed_module',
--- a/netbox/dcim/graphql/filter_mixins.py
+++ b/netbox/dcim/graphql/filter_mixins.py
@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Annotated
 import strawberry
 import strawberry_django
 from strawberry import ID
-from strawberry_django import BaseFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, FilterLookup, StrFilterLookup

 from core.graphql.filters import ContentTypeFilter

@@ -66,9 +66,9 @@ class ComponentModelFilterMixin:
    )
    device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    device_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    label: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    label: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()


@dataclass
@@ -96,9 +96,9 @@ class ComponentTemplateFilterMixin:
        strawberry_django.filter_field()
    )
    device_type_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    label: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    label: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()


@dataclass
--- a/netbox/dcim/graphql/filters.py
+++ b/netbox/dcim/graphql/filters.py
@@ -4,7 +4,7 @@ import strawberry
 import strawberry_django
 from django.db.models import Q
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, ComparisonFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, ComparisonFilterLookup, FilterLookup, StrFilterLookup

 from dcim import models
 from dcim.constants import *
@@ -63,9 +63,9 @@ __all__ = (
    'ConsolePortTemplateFilter',
    'ConsoleServerPortFilter',
    'ConsoleServerPortTemplateFilter',
-    'DeviceFilter',
    'DeviceBayFilter',
    'DeviceBayTemplateFilter',
+    'DeviceFilter',
    'DeviceRoleFilter',
    'DeviceTypeFilter',
    'FrontPortFilter',
@@ -78,9 +78,9 @@ __all__ = (
    'LocationFilter',
    'MACAddressFilter',
    'ManufacturerFilter',
-    'ModuleFilter',
    'ModuleBayFilter',
    'ModuleBayTemplateFilter',
+    'ModuleFilter',
    'ModuleTypeFilter',
    'ModuleTypeProfileFilter',
    'PlatformFilter',
@@ -114,7 +114,7 @@ class CableFilter(TenancyFilterMixin, PrimaryModelFilter):
    status: BaseFilterLookup[Annotated['LinkStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    label: FilterLookup[str] | None = strawberry_django.filter_field()
+    label: StrFilterLookup[str] | None = strawberry_django.filter_field()
    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -141,6 +141,20 @@ class CableTerminationFilter(ChangeLoggedModelFilter):
    )
    termination_id: ID | None = strawberry_django.filter_field()

+    # Cached relations
+    _device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field(
+        name='device'
+    )
+    _rack: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field(
+        name='rack'
+    )
+    _location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
+        strawberry_django.filter_field(name='location')
+    )
+    _site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field(
+        name='site'
+    )
+

@strawberry_django.filter_type(models.ConsolePort, lookups=True)
 class ConsolePortFilter(ModularComponentFilterMixin, CabledObjectModelFilterMixin, NetBoxModelFilter):
@@ -196,9 +210,9 @@ class DeviceFilter(
    platform: Annotated['PlatformFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    serial: FilterLookup[str] | None = strawberry_django.filter_field()
-    asset_tag: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    serial: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    asset_tag: StrFilterLookup[str] | None = strawberry_django.filter_field()
    site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    site_id: ID | None = strawberry_django.filter_field()
    location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -325,7 +339,7 @@ class InventoryItemTemplateFilter(ComponentTemplateFilterMixin, ChangeLoggedMode
        strawberry_django.filter_field()
    )
    manufacturer_id: ID | None = strawberry_django.filter_field()
-    part_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    part_id: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.DeviceRole, lookups=True)
@@ -342,13 +356,13 @@ class DeviceTypeFilter(ImageAttachmentFilterMixin, WeightFilterMixin, PrimaryMod
        strawberry_django.filter_field()
    )
    manufacturer_id: ID | None = strawberry_django.filter_field()
-    model: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    model: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    default_platform: Annotated['PlatformFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
    default_platform_id: ID | None = strawberry_django.filter_field()
-    part_number: FilterLookup[str] | None = strawberry_django.filter_field()
+    part_number: StrFilterLookup[str] | None = strawberry_django.filter_field()
    instances: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -465,7 +479,7 @@ class PortTemplateMappingFilter(BaseModelFilter):

@strawberry_django.filter_type(models.MACAddress, lookups=True)
 class MACAddressFilter(PrimaryModelFilter):
-    mac_address: FilterLookup[str] | None = strawberry_django.filter_field()
+    mac_address: StrFilterLookup[str] | None = strawberry_django.filter_field()
    assigned_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -511,7 +525,7 @@ class InterfaceFilter(
    duplex: BaseFilterLookup[Annotated['InterfaceDuplexEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    wwn: FilterLookup[str] | None = strawberry_django.filter_field()
+    wwn: StrFilterLookup[str] | None = strawberry_django.filter_field()
    parent: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -631,9 +645,9 @@ class InventoryItemFilter(ComponentModelFilterMixin, NetBoxModelFilter):
        strawberry_django.filter_field()
    )
    manufacturer_id: ID | None = strawberry_django.filter_field()
-    part_id: FilterLookup[str] | None = strawberry_django.filter_field()
-    serial: FilterLookup[str] | None = strawberry_django.filter_field()
-    asset_tag: FilterLookup[str] | None = strawberry_django.filter_field()
+    part_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    serial: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    asset_tag: StrFilterLookup[str] | None = strawberry_django.filter_field()
    discovered: FilterLookup[bool] | None = strawberry_django.filter_field()


@@ -651,7 +665,7 @@ class LocationFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilt
    status: BaseFilterLookup[Annotated['LocationStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    facility: FilterLookup[str] | None = strawberry_django.filter_field()
+    facility: StrFilterLookup[str] | None = strawberry_django.filter_field()
    prefixes: Annotated['PrefixFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -680,8 +694,8 @@ class ModuleFilter(ConfigContextFilterMixin, PrimaryModelFilter):
    status: BaseFilterLookup[Annotated['ModuleStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    serial: FilterLookup[str] | None = strawberry_django.filter_field()
-    asset_tag: FilterLookup[str] | None = strawberry_django.filter_field()
+    serial: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    asset_tag: StrFilterLookup[str] | None = strawberry_django.filter_field()
    console_ports: Annotated['ConsolePortFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -720,17 +734,17 @@ class ModuleBayFilter(ModularComponentFilterMixin, NetBoxModelFilter):
        strawberry_django.filter_field()
    )
    parent_id: ID | None = strawberry_django.filter_field()
-    position: FilterLookup[str] | None = strawberry_django.filter_field()
+    position: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.ModuleBayTemplate, lookups=True)
 class ModuleBayTemplateFilter(ModularComponentTemplateFilterMixin, ChangeLoggedModelFilter):
-    position: FilterLookup[str] | None = strawberry_django.filter_field()
+    position: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.ModuleTypeProfile, lookups=True)
 class ModuleTypeProfileFilter(PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.ModuleType, lookups=True)
@@ -743,8 +757,8 @@ class ModuleTypeFilter(ImageAttachmentFilterMixin, WeightFilterMixin, PrimaryMod
        strawberry_django.filter_field()
    )
    profile_id: ID | None = strawberry_django.filter_field()
-    model: FilterLookup[str] | None = strawberry_django.filter_field()
-    part_number: FilterLookup[str] | None = strawberry_django.filter_field()
+    model: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    part_number: StrFilterLookup[str] | None = strawberry_django.filter_field()
    instances: Annotated['ModuleFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -804,7 +818,7 @@ class PowerFeedFilter(CabledObjectModelFilterMixin, TenancyFilterMixin, PrimaryM
    power_panel_id: ID | None = strawberry_django.filter_field()
    rack: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    rack_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: BaseFilterLookup[Annotated['PowerFeedStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -875,7 +889,7 @@ class PowerPanelFilter(ContactFilterMixin, ImageAttachmentFilterMixin, PrimaryMo
    location_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.PowerPort, lookups=True)
@@ -913,8 +927,8 @@ class RackTypeFilter(ImageAttachmentFilterMixin, RackFilterMixin, WeightFilterMi
        strawberry_django.filter_field()
    )
    manufacturer_id: ID | None = strawberry_django.filter_field()
-    model: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    model: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    racks: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    rack_count: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()

@@ -935,8 +949,8 @@ class RackFilter(
        strawberry_django.filter_field()
    )
    rack_type_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    facility_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    facility_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
    site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    site_id: ID | None = strawberry_django.filter_field()
    location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -950,8 +964,8 @@ class RackFilter(
    )
    role: Annotated['RackRoleFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    role_id: ID | None = strawberry_django.filter_field()
-    serial: FilterLookup[str] | None = strawberry_django.filter_field()
-    asset_tag: FilterLookup[str] | None = strawberry_django.filter_field()
+    serial: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    asset_tag: StrFilterLookup[str] | None = strawberry_django.filter_field()
    airflow: BaseFilterLookup[Annotated['RackAirflowEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -969,7 +983,7 @@ class RackReservationFilter(TenancyFilterMixin, PrimaryModelFilter):
    )
    user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
    user_id: ID | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: BaseFilterLookup[Annotated['RackReservationStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -1020,8 +1034,8 @@ class RegionFilter(ContactFilterMixin, NestedGroupModelFilter):

@strawberry_django.filter_type(models.Site, lookups=True)
 class SiteFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: BaseFilterLookup[Annotated['SiteStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -1035,11 +1049,11 @@ class SiteFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMi
    group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    facility: FilterLookup[str] | None = strawberry_django.filter_field()
+    facility: StrFilterLookup[str] | None = strawberry_django.filter_field()
    asns: Annotated['ASNFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
-    time_zone: FilterLookup[str] | None = strawberry_django.filter_field()
-    physical_address: FilterLookup[str] | None = strawberry_django.filter_field()
-    shipping_address: FilterLookup[str] | None = strawberry_django.filter_field()
+    time_zone: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    physical_address: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    shipping_address: StrFilterLookup[str] | None = strawberry_django.filter_field()
    latitude: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -1068,8 +1082,8 @@ class SiteGroupFilter(ContactFilterMixin, NestedGroupModelFilter):
 class VirtualChassisFilter(PrimaryModelFilter):
    master: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    master_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    domain: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    domain: StrFilterLookup[str] | None = strawberry_django.filter_field()
    members: (
        Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None
    ) = strawberry_django.filter_field()
@@ -1080,7 +1094,7 @@ class VirtualChassisFilter(PrimaryModelFilter):
 class VirtualDeviceContextFilter(TenancyFilterMixin, PrimaryModelFilter):
    device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    device_id: ID | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: (
        BaseFilterLookup[Annotated['VirtualDeviceContextStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None
    ) = (
@@ -1097,7 +1111,7 @@ class VirtualDeviceContextFilter(TenancyFilterMixin, PrimaryModelFilter):
        strawberry_django.filter_field()
    )
    primary_ip6_id: ID | None = strawberry_django.filter_field()
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()
    interfaces: (
        Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None
    ) = strawberry_django.filter_field()
--- a/netbox/dcim/graphql/gfk_mixins.py
+++ b/netbox/dcim/graphql/gfk_mixins.py
@@ -119,7 +119,7 @@ class ConnectedEndpointType:
    def resolve_type(cls, instance, info: Info):
        if type(instance) is CircuitTermination:
            return CircuitTerminationType
-        if type(instance) is ConsolePortType:
+        if type(instance) is ConsolePort:
            return ConsolePortType
        if type(instance) is ConsoleServerPort:
            return ConsoleServerPortType
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -41,47 +41,47 @@ if TYPE_CHECKING:
 __all__ = (
    'CableType',
    'ComponentType',
-    'ConsolePortType',
    'ConsolePortTemplateType',
-    'ConsoleServerPortType',
+    'ConsolePortType',
    'ConsoleServerPortTemplateType',
-    'DeviceType',
-    'DeviceBayType',
+    'ConsoleServerPortType',
    'DeviceBayTemplateType',
+    'DeviceBayType',
    'DeviceRoleType',
+    'DeviceType',
    'DeviceTypeType',
-    'FrontPortType',
    'FrontPortTemplateType',
-    'InterfaceType',
+    'FrontPortType',
    'InterfaceTemplateType',
-    'InventoryItemType',
+    'InterfaceType',
    'InventoryItemRoleType',
    'InventoryItemTemplateType',
+    'InventoryItemType',
    'LocationType',
    'MACAddressType',
    'ManufacturerType',
    'ModularComponentType',
-    'ModuleType',
-    'ModuleBayType',
    'ModuleBayTemplateType',
+    'ModuleBayType',
+    'ModuleType',
    'ModuleTypeProfileType',
    'ModuleTypeType',
    'PlatformType',
    'PowerFeedType',
-    'PowerOutletType',
    'PowerOutletTemplateType',
+    'PowerOutletType',
    'PowerPanelType',
-    'PowerPortType',
    'PowerPortTemplateType',
-    'RackType',
+    'PowerPortType',
    'RackReservationType',
    'RackRoleType',
+    'RackType',
    'RackTypeType',
-    'RearPortType',
    'RearPortTemplateType',
+    'RearPortType',
    'RegionType',
-    'SiteType',
    'SiteGroupType',
+    'SiteType',
    'VirtualChassisType',
    'VirtualDeviceContextType',
 )
--- a/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py
+++ b/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py
@@ -0,0 +1,32 @@
+import mptt.managers
+import mptt.models
+from django.db import migrations
+
+
+def rebuild_mptt(apps, schema_editor):
+    """
+    Rebuild the MPTT tree for ModuleBay to apply new ordering.
+    """
+    ModuleBay = apps.get_model('dcim', 'ModuleBay')
+
+    # Set MPTTMeta with the correct order_insertion_by
+    class MPTTMeta:
+        order_insertion_by = ('name',)
+
+    ModuleBay.MPTTMeta = MPTTMeta
+    ModuleBay._mptt_meta = mptt.models.MPTTOptions(MPTTMeta)
+
+    manager = mptt.managers.TreeManager()
+    manager.model = ModuleBay
+    manager.contribute_to_class(ModuleBay, 'objects')
+    manager.rebuild()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('dcim', '0226_add_mptt_tree_indexes'),
+    ]
+
+    operations = [
+        migrations.RunPython(code=rebuild_mptt, reverse_code=migrations.RunPython.noop),
+    ]
--- a/netbox/dcim/models/cables.py
+++ b/netbox/dcim/models/cables.py
@@ -305,6 +305,50 @@ class Cable(PrimaryModel):
        except UnsupportedCablePath as e:
            raise AbortRequest(e)

+    def clone(self):
+        """
+        Return attributes suitable for cloning this cable.
+
+        In addition to the fields defined in `clone_fields`, include the termination
+        type and parent selector fields used by dcim.forms.connections.get_cable_form().
+        """
+        attrs = super().clone()
+
+        # Mirror dcim.forms.connections.get_cable_form() parent-field logic
+        for cable_end, terminations in (('a', self.a_terminations), ('b', self.b_terminations)):
+            if not terminations:
+                continue
+
+            term_cls = type(terminations[0])
+            term_label = term_cls._meta.label_lower
+
+            # Matches CableForm choices: "<app_label>.<model>"
+            attrs[f'{cable_end}_terminations_type'] = term_label
+
+            # Device component
+            if hasattr(term_cls, 'device'):
+                device_ids = sorted({t.device_id for t in terminations if t.device_id})
+                if device_ids:
+                    attrs[f'termination_{cable_end}_device'] = device_ids
+
+            # PowerFeed
+            elif term_label == 'dcim.powerfeed':
+                powerpanel_ids = sorted({t.power_panel_id for t in terminations if t.power_panel_id})
+                if powerpanel_ids:
+                    attrs[f'termination_{cable_end}_powerpanel'] = powerpanel_ids
+
+            # CircuitTermination
+            elif term_label == 'circuits.circuittermination':
+                circuit_ids = sorted({t.circuit_id for t in terminations if t.circuit_id})
+                if circuit_ids:
+                    attrs[f'termination_{cable_end}_circuit'] = circuit_ids
+
+        # Never clone the actual terminations, as they are already occupied
+        attrs.pop('a_terminations', None)
+        attrs.pop('b_terminations', None)
+
+        return attrs
+
    def serialize_object(self, exclude=None):
        data = serialize_object(self, exclude=exclude or [])

--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1276,7 +1276,7 @@ class ModuleBay(ModularComponentModel, TrackingModelMixin, MPTTModel):
        verbose_name_plural = _('module bays')

    class MPTTMeta:
-        order_insertion_by = ('module',)
+        order_insertion_by = ('name',)

    def clean(self):
        super().clean()
--- a/netbox/dcim/models/modules.py
+++ b/netbox/dcim/models/modules.py
@@ -5,6 +5,7 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.utils.translation import gettext_lazy as _
 from jsonschema.exceptions import ValidationError as JSONValidationError
+from mptt.models import MPTTModel

 from dcim.choices import *
 from dcim.utils import create_port_mappings, update_interface_bridges
@@ -332,7 +333,8 @@ class Module(TrackingModelMixin, PrimaryModel, ConfigContextModel):
                component._location = self.device.location
                component._rack = self.device.rack

-            if component_model is not ModuleBay:
+            # we handle create and update separately - this is for create
+            if not issubclass(component_model, MPTTModel):
                component_model.objects.bulk_create(create_instances)
                # Emit the post_save signal for each newly created object
                for component in create_instances:
@@ -345,11 +347,13 @@ class Module(TrackingModelMixin, PrimaryModel, ConfigContextModel):
                        update_fields=None
                    )
            else:
-                # ModuleBays must be saved individually for MPTT
+                # MPTT models must be saved individually to maintain tree structure
                for instance in create_instances:
                    instance.save()

            update_fields = ['module']
+
+            # we handle create and update separately - this is for update
            component_model.objects.bulk_update(update_instances, update_fields)
            # Emit the post_save signal for each updated object
            for component in update_instances:
@@ -362,7 +366,12 @@ class Module(TrackingModelMixin, PrimaryModel, ConfigContextModel):
                    update_fields=update_fields
                )

+            # Rebuild MPTT tree if needed (bulk_update bypasses model save)
+            if issubclass(component_model, MPTTModel) and update_instances:
+                component_model.objects.rebuild()
+
        # Replicate any front/rear port mappings from the ModuleType
        create_port_mappings(self.device, self.module_type, self)
+
        # Interface bridges have to be set after interface instantiation
        update_interface_bridges(self.device, self.module_type.interfacetemplates, self)
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -21,14 +21,14 @@ __all__ = (
    'DeviceInterfaceTable',
    'DeviceInventoryItemTable',
    'DeviceModuleBayTable',
-    'DevicePowerPortTable',
    'DevicePowerOutletTable',
+    'DevicePowerPortTable',
    'DeviceRearPortTable',
    'DeviceRoleTable',
    'DeviceTable',
    'FrontPortTable',
-    'InterfaceTable',
    'InterfaceLAGMemberTable',
+    'InterfaceTable',
    'InventoryItemRoleTable',
    'InventoryItemTable',
    'MACAddressTable',
--- a/netbox/dcim/tables/racks.py
+++ b/netbox/dcim/tables/racks.py
@@ -9,9 +9,9 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from .template_code import OUTER_UNIT, WEIGHT

 __all__ = (
-    'RackTable',
    'RackReservationTable',
    'RackRoleTable',
+    'RackTable',
    'RackTypeTable',
 )

--- a/netbox/dcim/tables/sites.py
+++ b/netbox/dcim/tables/sites.py
@@ -10,8 +10,8 @@ from .template_code import LOCATION_BUTTONS
 __all__ = (
    'LocationTable',
    'RegionTable',
-    'SiteTable',
    'SiteGroupTable',
+    'SiteTable',
 )


--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -2614,6 +2614,126 @@ class CableTest(APIViewTestCases.APIViewTestCase):
            },
        ]

+    def test_graphql_cable_termination_cached_filters(self):
+        """
+        Validate filtering cables by cached CableTermination relations via GraphQL:
+
+          cable_list(filters: { terminations: { <relation>: {...}, DISTINCT: true } })
+
+        Also asserts deduplication when both ends match (cable between two interfaces
+        on the same device/rack/location/site).
+        """
+        self.add_permissions(
+            'dcim.view_cable',
+            'dcim.view_device',
+            'dcim.view_interface',
+            'dcim.view_rack',
+            'dcim.view_location',
+            'dcim.view_site',
+        )
+
+        # Reuse existing fixtures from setUpTestData()
+        devicetype = DeviceType.objects.get(slug='device-type-1')
+        role = DeviceRole.objects.get(slug='device-role-1')
+
+        # Create an isolated topology for this test
+        site_a = Site.objects.create(name='GQL Site A', slug='gql-site-a')
+        site_b = Site.objects.create(name='GQL Site B', slug='gql-site-b')
+
+        location_a = Location.objects.create(
+            site=site_a,
+            name='GQL Location A',
+            slug='gql-location-a',
+            status=LocationStatusChoices.STATUS_ACTIVE,
+        )
+        location_b = Location.objects.create(
+            site=site_b,
+            name='GQL Location B',
+            slug='gql-location-b',
+            status=LocationStatusChoices.STATUS_ACTIVE,
+        )
+
+        rack_a = Rack.objects.create(site=site_a, location=location_a, name='GQL Rack A', u_height=42)
+        rack_b = Rack.objects.create(site=site_b, location=location_b, name='GQL Rack B', u_height=42)
+
+        device_a = Device.objects.create(
+            device_type=devicetype,
+            role=role,
+            name='GQL Device A',
+            site=site_a,
+            location=location_a,
+            rack=rack_a,
+        )
+        device_b = Device.objects.create(
+            device_type=devicetype,
+            role=role,
+            name='GQL Device B',
+            site=site_b,
+            location=location_b,
+            rack=rack_b,
+        )
+
+        a0 = Interface.objects.create(device=device_a, type=InterfaceTypeChoices.TYPE_1GE_FIXED, name='eth0')
+        a1 = Interface.objects.create(device=device_a, type=InterfaceTypeChoices.TYPE_1GE_FIXED, name='eth1')
+        a2 = Interface.objects.create(device=device_a, type=InterfaceTypeChoices.TYPE_1GE_FIXED, name='eth2')
+        b0 = Interface.objects.create(device=device_b, type=InterfaceTypeChoices.TYPE_1GE_FIXED, name='eth0')
+
+        # Both ends on Device A (duplication risk without DISTINCT)
+        cable_same_device = Cable(a_terminations=[a0], b_terminations=[a1], label='GQL Cable Same Device')
+        cable_same_device.save()
+
+        # Cross to Device B
+        cable_cross = Cable(a_terminations=[a2], b_terminations=[b0], label='GQL Cable Cross')
+        cable_cross.save()
+
+        expected_a = {str(cable_same_device.pk), str(cable_cross.pk)}
+        expected_b = {str(cable_cross.pk)}
+
+        url = reverse('graphql')
+
+        test_cases = (
+            # Device (ID + name)
+            (f'device: {{ id: {{ exact: "{device_a.pk}" }} }}', expected_a),
+            (f'device: {{ name: {{ exact: "{device_a.name}" }} }}', expected_a),
+            (f'device: {{ id: {{ exact: "{device_b.pk}" }} }}', expected_b),
+            (f'device: {{ name: {{ exact: "{device_b.name}" }} }}', expected_b),
+            # Rack (ID + name)
+            (f'rack: {{ id: {{ exact: "{rack_a.pk}" }} }}', expected_a),
+            (f'rack: {{ name: {{ exact: "{rack_a.name}" }} }}', expected_a),
+            (f'rack: {{ id: {{ exact: "{rack_b.pk}" }} }}', expected_b),
+            (f'rack: {{ name: {{ exact: "{rack_b.name}" }} }}', expected_b),
+            # Location (ID + name)
+            (f'location: {{ id: {{ exact: "{location_a.pk}" }} }}', expected_a),
+            (f'location: {{ name: {{ exact: "{location_a.name}" }} }}', expected_a),
+            (f'location: {{ id: {{ exact: "{location_b.pk}" }} }}', expected_b),
+            (f'location: {{ name: {{ exact: "{location_b.name}" }} }}', expected_b),
+            # Site (ID + slug)
+            (f'site: {{ id: {{ exact: "{site_a.pk}" }} }}', expected_a),
+            (f'site: {{ slug: {{ exact: "{site_a.slug}" }} }}', expected_a),
+            (f'site: {{ id: {{ exact: "{site_b.pk}" }} }}', expected_b),
+            (f'site: {{ slug: {{ exact: "{site_b.slug}" }} }}', expected_b),
+        )
+
+        for inner_filter, expected in test_cases:
+            with self.subTest(filter=inner_filter):
+                query = f"""{{
+                  cable_list(filters: {{ terminations: {{ {inner_filter} DISTINCT: true }} }})
+                  {{ id }}
+                }}"""
+
+                response = self.client.post(url, data={'query': query}, format='json', **self.header)
+                self.assertHttpStatus(response, status.HTTP_200_OK)
+                data = response.json()
+                self.assertNotIn('errors', data)
+
+                rows = data['data']['cable_list']
+                ids = [row['id'] for row in rows]
+
+                # Ensure DISTINCT is actually effective (no duplicate cables when both ends match)
+                self.assertEqual(len(ids), len(set(ids)), f'Duplicate cables returned for: {inner_filter}')
+
+                self.assertSetEqual(set(ids), expected)
+

 class CableTerminationTest(
    APIViewTestCases.GetObjectViewTestCase,
--- a/netbox/dcim/ui/panels.py
+++ b/netbox/dcim/ui/panels.py
@@ -44,7 +44,7 @@ class RackPanel(panels.ObjectAttributesPanel):
    site = attrs.RelatedObjectAttr('site', linkify=True, grouped_by='group')
    location = attrs.NestedObjectAttr('location', linkify=True)
    name = attrs.TextAttr('name')
-    facility = attrs.TextAttr('facility', label=_('Facility ID'))
+    facility_id = attrs.TextAttr('facility_id', label=_('Facility ID'))
    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
    status = attrs.ChoiceAttr('status')
    rack_type = attrs.RelatedObjectAttr('rack_type', linkify=True, grouped_by='manufacturer')
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2733,6 +2733,7 @@ class DeviceBulkImportView(generic.BulkImportView):
        # For child devices, save the reverse relation to the parent device bay
        if parent_bay:
            device_bay = parent_bay
+            device_bay.snapshot()
            device_bay.installed_device = obj
            device_bay.save()

@@ -3912,19 +3913,6 @@ class CableEditView(generic.ObjectEditView):

        return super().alter_object(obj, request, url_args, url_kwargs)

-    def get_extra_addanother_params(self, request):
-
-        params = {
-            'a_terminations_type': request.GET.get('a_terminations_type'),
-            'b_terminations_type': request.GET.get('b_terminations_type')
-        }
-
-        for key in request.POST:
-            if 'device' in key or 'power_panel' in key or 'circuit' in key:
-                params.update({key: request.POST.get(key)})
-
-        return params
-

@register_model_view(Cable, 'delete')
 class CableDeleteView(generic.ObjectDeleteView):
@@ -4099,6 +4087,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
                members = formset.save(commit=False)
                devices = Device.objects.filter(pk__in=[m.pk for m in members])
                for device in devices:
+                    device.snapshot()
                    device.vc_position = None
                    device.save()
                for member in members:
--- a/netbox/extras/api/serializers_/notifications.py
+++ b/netbox/extras/api/serializers_/notifications.py
@@ -7,8 +7,8 @@ from users.api.serializers_.users import GroupSerializer, UserSerializer
 from users.models import Group, User

 __all__ = (
-    'NotificationSerializer',
    'NotificationGroupSerializer',
+    'NotificationSerializer',
    'SubscriptionSerializer',
 )

--- a/netbox/extras/graphql/filter_mixins.py
+++ b/netbox/extras/graphql/filter_mixins.py
@@ -10,10 +10,10 @@ if TYPE_CHECKING:
    from .filters import *

 __all__ = (
+    'ConfigContextFilterMixin',
    'CustomFieldsFilterMixin',
    'JournalEntriesFilterMixin',
    'TagsFilterMixin',
-    'ConfigContextFilterMixin',
 )


--- a/netbox/extras/graphql/filters.py
+++ b/netbox/extras/graphql/filters.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Annotated
 import strawberry
 import strawberry_django
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, FilterLookup, StrFilterLookup

 from extras import models
 from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin
@@ -33,8 +33,8 @@ __all__ = (
    'ConfigContextFilter',
    'ConfigContextProfileFilter',
    'ConfigTemplateFilter',
-    'CustomFieldFilter',
    'CustomFieldChoiceSetFilter',
+    'CustomFieldFilter',
    'CustomLinkFilter',
    'EventRuleFilter',
    'ExportTemplateFilter',
@@ -50,11 +50,11 @@ __all__ = (

@strawberry_django.filter_type(models.ConfigContext, lookups=True)
 class ConfigContextFilter(SyncedDataFilterMixin, ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    is_active: FilterLookup[bool] | None = strawberry_django.filter_field()
    regions: Annotated['RegionFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
@@ -107,22 +107,22 @@ class ConfigContextFilter(SyncedDataFilterMixin, ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.ConfigContextProfile, lookups=True)
 class ConfigContextProfileFilter(SyncedDataFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] = strawberry_django.filter_field()
-    description: FilterLookup[str] = strawberry_django.filter_field()
+    name: StrFilterLookup[str] = strawberry_django.filter_field()
+    description: StrFilterLookup[str] = strawberry_django.filter_field()
    tags: Annotated['TagFilter', strawberry.lazy('extras.graphql.filters')] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.ConfigTemplate, lookups=True)
 class ConfigTemplateFilter(SyncedDataFilterMixin, ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
-    template_code: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    template_code: StrFilterLookup[str] | None = strawberry_django.filter_field()
    environment_params: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    mime_type: FilterLookup[str] | None = strawberry_django.filter_field()
-    file_name: FilterLookup[str] | None = strawberry_django.filter_field()
-    file_extension: FilterLookup[str] | None = strawberry_django.filter_field()
+    mime_type: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    file_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    file_extension: StrFilterLookup[str] | None = strawberry_django.filter_field()
    as_attachment: FilterLookup[bool] | None = strawberry_django.filter_field()


@@ -137,10 +137,10 @@ class CustomFieldFilter(ChangeLoggedModelFilter):
    related_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    label: FilterLookup[str] | None = strawberry_django.filter_field()
-    group_name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    label: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    group_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    required: FilterLookup[bool] | None = strawberry_django.filter_field()
    unique: FilterLookup[bool] | None = strawberry_django.filter_field()
    search_weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -166,7 +166,7 @@ class CustomFieldFilter(ChangeLoggedModelFilter):
    validation_maximum: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    validation_regex: FilterLookup[str] | None = strawberry_django.filter_field()
+    validation_regex: StrFilterLookup[str] | None = strawberry_django.filter_field()
    choice_set: Annotated['CustomFieldChoiceSetFilter', strawberry.lazy('extras.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -182,13 +182,13 @@ class CustomFieldFilter(ChangeLoggedModelFilter):
        strawberry_django.filter_field()
    )
    is_cloneable: FilterLookup[bool] | None = strawberry_django.filter_field()
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.CustomFieldChoiceSet, lookups=True)
 class CustomFieldChoiceSetFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    base_choices: (
        BaseFilterLookup[Annotated['CustomFieldChoiceSetBaseEnum', strawberry.lazy('extras.graphql.enums')]] | None
    ) = (
@@ -202,14 +202,14 @@ class CustomFieldChoiceSetFilter(ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.CustomLink, lookups=True)
 class CustomLinkFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
-    link_text: FilterLookup[str] | None = strawberry_django.filter_field()
-    link_url: FilterLookup[str] | None = strawberry_django.filter_field()
+    link_text: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    link_url: StrFilterLookup[str] | None = strawberry_django.filter_field()
    weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    group_name: FilterLookup[str] | None = strawberry_django.filter_field()
+    group_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    button_class: (
        BaseFilterLookup[Annotated['CustomLinkButtonClassEnum', strawberry.lazy('extras.graphql.enums')]] | None
    ) = (
@@ -220,15 +220,15 @@ class CustomLinkFilter(ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.ExportTemplate, lookups=True)
 class ExportTemplateFilter(SyncedDataFilterMixin, ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
-    template_code: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    template_code: StrFilterLookup[str] | None = strawberry_django.filter_field()
    environment_params: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    mime_type: FilterLookup[str] | None = strawberry_django.filter_field()
-    file_name: FilterLookup[str] | None = strawberry_django.filter_field()
-    file_extension: FilterLookup[str] | None = strawberry_django.filter_field()
+    mime_type: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    file_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    file_extension: StrFilterLookup[str] | None = strawberry_django.filter_field()
    as_attachment: FilterLookup[bool] | None = strawberry_django.filter_field()


@@ -244,7 +244,7 @@ class ImageAttachmentFilter(ChangeLoggedModelFilter):
    image_width: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.JournalEntry, lookups=True)
@@ -260,22 +260,22 @@ class JournalEntryFilter(CustomFieldsFilterMixin, TagsFilterMixin, ChangeLoggedM
    kind: BaseFilterLookup[Annotated['JournalEntryKindEnum', strawberry.lazy('extras.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.NotificationGroup, lookups=True)
 class NotificationGroupFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    groups: Annotated['GroupFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
    users: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.SavedFilter, lookups=True)
 class SavedFilterFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
    user_id: ID | None = strawberry_django.filter_field()
    weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -290,8 +290,8 @@ class SavedFilterFilter(ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.TableConfig, lookups=True)
 class TableConfigFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
    user_id: ID | None = strawberry_django.filter_field()
    weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -303,30 +303,30 @@ class TableConfigFilter(ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.Tag, lookups=True)
 class TagFilter(ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.Webhook, lookups=True)
 class WebhookFilter(CustomFieldsFilterMixin, TagsFilterMixin, ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
-    payload_url: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    payload_url: StrFilterLookup[str] | None = strawberry_django.filter_field()
    http_method: (
        BaseFilterLookup[Annotated['WebhookHttpMethodEnum', strawberry.lazy('extras.graphql.enums')]] | None
    ) = (
        strawberry_django.filter_field()
    )
-    http_content_type: FilterLookup[str] | None = strawberry_django.filter_field()
-    additional_headers: FilterLookup[str] | None = strawberry_django.filter_field()
-    body_template: FilterLookup[str] | None = strawberry_django.filter_field()
-    secret: FilterLookup[str] | None = strawberry_django.filter_field()
+    http_content_type: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    additional_headers: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    body_template: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    secret: StrFilterLookup[str] | None = strawberry_django.filter_field()
    ssl_verification: FilterLookup[bool] | None = strawberry_django.filter_field()
-    ca_file_path: FilterLookup[str] | None = strawberry_django.filter_field()
+    ca_file_path: StrFilterLookup[str] | None = strawberry_django.filter_field()
    events: Annotated['EventRuleFilter', strawberry.lazy('extras.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -334,8 +334,8 @@ class WebhookFilter(CustomFieldsFilterMixin, TagsFilterMixin, ChangeLoggedModelF

@strawberry_django.filter_type(models.EventRule, lookups=True)
 class EventRuleFilter(CustomFieldsFilterMixin, TagsFilterMixin, ChangeLoggedModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    event_types: Annotated['StringArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -346,10 +346,10 @@ class EventRuleFilter(CustomFieldsFilterMixin, TagsFilterMixin, ChangeLoggedMode
    action_type: BaseFilterLookup[Annotated['EventRuleActionEnum', strawberry.lazy('extras.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    action_object_type: FilterLookup[str] | None = strawberry_django.filter_field()
+    action_object_type: StrFilterLookup[str] | None = strawberry_django.filter_field()
    action_object_type_id: ID | None = strawberry_django.filter_field()
    action_object_id: ID | None = strawberry_django.filter_field()
    action_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()
--- a/netbox/extras/graphql/mixins.py
+++ b/netbox/extras/graphql/mixins.py
@@ -22,7 +22,19 @@ if TYPE_CHECKING:
@strawberry.type
 class ConfigContextMixin:

-    @strawberry_django.field
+    @classmethod
+    def get_queryset(cls, queryset, info: Info, **kwargs):
+        queryset = super().get_queryset(queryset, info, **kwargs)
+
+        # If `config_context` is requested, call annotate_config_context_data() on the queryset
+        selected = {f.name for f in info.selected_fields[0].selections}
+        if 'config_context' in selected and hasattr(queryset, 'annotate_config_context_data'):
+            return queryset.annotate_config_context_data()
+
+        return queryset
+
+    # Ensure `local_context_data` is fetched when `config_context` is requested
+    @strawberry_django.field(only=['local_context_data'])
    def config_context(self) -> strawberry.scalars.JSON:
        return self.get_config_context()

--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -24,14 +24,14 @@ __all__ = (
    'BaseScript',
    'BooleanVar',
    'ChoiceVar',
-    'DateVar',
    'DateTimeVar',
-    'FileVar',
-    'IntegerVar',
+    'DateVar',
    'DecimalVar',
+    'FileVar',
    'IPAddressVar',
    'IPAddressWithMaskVar',
    'IPNetworkVar',
+    'IntegerVar',
    'MultiChoiceVar',
    'MultiObjectVar',
    'ObjectVar',
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -28,14 +28,14 @@ __all__ = (
    'JournalEntryTable',
    'NotificationGroupTable',
    'NotificationTable',
-    'SavedFilterTable',
    'ReportResultsTable',
-    'ScriptResultsTable',
+    'SavedFilterTable',
    'ScriptJobTable',
+    'ScriptResultsTable',
    'SubscriptionTable',
    'TableConfigTable',
-    'TaggedItemTable',
    'TagTable',
+    'TaggedItemTable',
    'WebhookTable',
 )

--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1582,11 +1582,7 @@ class ScriptJobsView(BaseScriptView):
    def get(self, request, **kwargs):
        script = self.get_object(**kwargs)

-        jobs_table = ScriptJobTable(
-            data=script.jobs.all(),
-            orderable=False,
-            user=request.user
-        )
+        jobs_table = ScriptJobTable(data=script.jobs.all(), orderable=False)
        jobs_table.configure(request)

        return render(request, 'extras/script/jobs.html', {
@@ -1632,7 +1628,7 @@ class ScriptResultView(TableMixin, generic.ObjectView):
                        }
                        data.append(result)

-                table = ScriptResultsTable(data, user=request.user)
+                table = ScriptResultsTable(data)
                table.configure(request)
            else:
                # for legacy reports
@@ -1656,7 +1652,7 @@ class ScriptResultView(TableMixin, generic.ObjectView):
                            }
                            data.append(result)

-            table = ReportResultsTable(data, user=request.user)
+            table = ReportResultsTable(data)
            table.configure(request)

        return table
--- a/netbox/ipam/api/serializers_/ip.py
+++ b/netbox/ipam/api/serializers_/ip.py
@@ -19,8 +19,8 @@ from .vrfs import VRFSerializer

 __all__ = (
    'AggregateSerializer',
-    'AvailableIPSerializer',
    'AvailableIPRequestSerializer',
+    'AvailableIPSerializer',
    'AvailablePrefixSerializer',
    'IPAddressSerializer',
    'IPRangeSerializer',
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -33,9 +33,9 @@ from .choices import *
 from .models import *

 __all__ = (
-    'AggregateFilterSet',
    'ASNFilterSet',
    'ASNRangeFilterSet',
+    'AggregateFilterSet',
    'FHRPGroupAssignmentFilterSet',
    'FHRPGroupFilterSet',
    'IPAddressFilterSet',
--- a/netbox/ipam/forms/bulk_edit.py
+++ b/netbox/ipam/forms/bulk_edit.py
@@ -24,9 +24,9 @@ from utilities.forms.widgets import BulkEditNullBooleanSelect, HTMXSelect
 from utilities.templatetags.builtins.filters import bettertitle

 __all__ = (
-    'AggregateBulkEditForm',
    'ASNBulkEditForm',
    'ASNRangeBulkEditForm',
+    'AggregateBulkEditForm',
    'FHRPGroupBulkEditForm',
    'IPAddressBulkEditForm',
    'IPRangeBulkEditForm',
--- a/netbox/ipam/forms/bulk_import.py
+++ b/netbox/ipam/forms/bulk_import.py
@@ -20,9 +20,9 @@ from utilities.forms.fields import (
 from virtualization.models import VirtualMachine, VMInterface

 __all__ = (
-    'AggregateImportForm',
    'ASNImportForm',
    'ASNRangeImportForm',
+    'AggregateImportForm',
    'FHRPGroupImportForm',
    'IPAddressImportForm',
    'IPRangeImportForm',
@@ -32,8 +32,8 @@ __all__ = (
    'RouteTargetImportForm',
    'ServiceImportForm',
    'ServiceTemplateImportForm',
-    'VLANImportForm',
    'VLANGroupImportForm',
+    'VLANImportForm',
    'VLANTranslationPolicyImportForm',
    'VLANTranslationRuleImportForm',
    'VRFImportForm',
@@ -424,6 +424,7 @@ class IPAddressImportForm(PrimaryModelImportForm):
        # Set as primary for device/VM
        if self.cleaned_data.get('is_primary') is not None:
            parent = self.cleaned_data.get('device') or self.cleaned_data.get('virtual_machine')
+            parent.snapshot()
            if self.instance.address.version == 4:
                parent.primary_ip4 = ipaddress if self.cleaned_data.get('is_primary') else None
            elif self.instance.address.version == 6:
@@ -433,6 +434,7 @@ class IPAddressImportForm(PrimaryModelImportForm):
        # Set as OOB for device
        if self.cleaned_data.get('is_oob') is not None:
            parent = self.cleaned_data.get('device')
+            parent.snapshot()
            parent.oob_ip = ipaddress if self.cleaned_data.get('is_oob') else None
            parent.save()

--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -14,9 +14,9 @@ from virtualization.models import Cluster, ClusterGroup, VirtualMachine
 from vpn.models import L2VPN

 __all__ = (
-    'AggregateFilterForm',
    'ASNFilterForm',
    'ASNRangeFilterForm',
+    'AggregateFilterForm',
    'FHRPGroupFilterForm',
    'IPAddressFilterForm',
    'IPRangeFilterForm',
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -28,11 +28,11 @@ from utilities.templatetags.builtins.filters import bettertitle
 from virtualization.models import VirtualMachine, VMInterface

 __all__ = (
-    'AggregateForm',
    'ASNForm',
    'ASNRangeForm',
-    'FHRPGroupForm',
+    'AggregateForm',
    'FHRPGroupAssignmentForm',
+    'FHRPGroupForm',
    'IPAddressAssignForm',
    'IPAddressBulkAddForm',
    'IPAddressForm',
@@ -41,8 +41,8 @@ __all__ = (
    'RIRForm',
    'RoleForm',
    'RouteTargetForm',
-    'ServiceForm',
    'ServiceCreateForm',
+    'ServiceForm',
    'ServiceTemplateForm',
    'VLANForm',
    'VLANGroupForm',
--- a/netbox/ipam/graphql/enums.py
+++ b/netbox/ipam/graphql/enums.py
@@ -11,8 +11,8 @@ __all__ = (
    'IPRangeStatusEnum',
    'PrefixStatusEnum',
    'ServiceProtocolEnum',
-    'VLANStatusEnum',
    'VLANQinQRoleEnum',
+    'VLANStatusEnum',
 )

 FHRPGroupAuthTypeEnum = strawberry.enum(FHRPGroupAuthTypeChoices.as_enum(prefix='authentication'))
--- a/netbox/ipam/graphql/filters.py
+++ b/netbox/ipam/graphql/filters.py
@@ -7,7 +7,7 @@ import strawberry_django
 from django.db.models import Q
 from netaddr.core import AddrFormatError
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, DateFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, DateFilterLookup, FilterLookup, StrFilterLookup

 from dcim.graphql.filter_mixins import ScopedFilterMixin
 from dcim.models import Device
@@ -35,8 +35,8 @@ __all__ = (
    'ASNFilter',
    'ASNRangeFilter',
    'AggregateFilter',
-    'FHRPGroupFilter',
    'FHRPGroupAssignmentFilter',
+    'FHRPGroupFilter',
    'IPAddressFilter',
    'IPRangeFilter',
    'PrefixFilter',
@@ -70,8 +70,8 @@ class ASNFilter(TenancyFilterMixin, PrimaryModelFilter):

@strawberry_django.filter_type(models.ASNRange, lookups=True)
 class ASNRangeFilter(TenancyFilterMixin, OrganizationalModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
    rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
    rir_id: ID | None = strawberry_django.filter_field()
    start: Annotated['BigIntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -84,7 +84,7 @@ class ASNRangeFilter(TenancyFilterMixin, OrganizationalModelFilter):

@strawberry_django.filter_type(models.Aggregate, lookups=True)
 class AggregateFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter):
-    prefix: FilterLookup[str] | None = strawberry_django.filter_field()
+    prefix: StrFilterLookup[str] | None = strawberry_django.filter_field()
    rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
    rir_id: ID | None = strawberry_django.filter_field()
    date_added: DateFilterLookup[date] | None = strawberry_django.filter_field()
@@ -120,14 +120,14 @@ class FHRPGroupFilter(PrimaryModelFilter):
    group_id: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    protocol: BaseFilterLookup[Annotated['FHRPGroupProtocolEnum', strawberry.lazy('ipam.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
    auth_type: BaseFilterLookup[Annotated['FHRPGroupAuthTypeEnum', strawberry.lazy('ipam.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
-    auth_key: FilterLookup[str] | None = strawberry_django.filter_field()
+    auth_key: StrFilterLookup[str] | None = strawberry_django.filter_field()
    ip_addresses: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -138,7 +138,7 @@ class FHRPGroupAssignmentFilter(ChangeLoggedModelFilter):
    interface_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    interface_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    interface_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
    group: Annotated['FHRPGroupFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -174,7 +174,7 @@ class FHRPGroupAssignmentFilter(ChangeLoggedModelFilter):

@strawberry_django.filter_type(models.IPAddress, lookups=True)
 class IPAddressFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter):
-    address: FilterLookup[str] | None = strawberry_django.filter_field()
+    address: StrFilterLookup[str] | None = strawberry_django.filter_field()
    vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
    vrf_id: ID | None = strawberry_django.filter_field()
    status: BaseFilterLookup[Annotated['IPAddressStatusEnum', strawberry.lazy('ipam.graphql.enums')]] | None = (
@@ -195,7 +195,7 @@ class IPAddressFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter
        strawberry_django.filter_field()
    )
    nat_outside_id: ID | None = strawberry_django.filter_field()
-    dns_name: FilterLookup[str] | None = strawberry_django.filter_field()
+    dns_name: StrFilterLookup[str] | None = strawberry_django.filter_field()

    @strawberry_django.filter_field()
    def assigned(self, value: bool, prefix) -> Q:
@@ -225,8 +225,8 @@ class IPAddressFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter

@strawberry_django.filter_type(models.IPRange, lookups=True)
 class IPRangeFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter):
-    start_address: FilterLookup[str] | None = strawberry_django.filter_field()
-    end_address: FilterLookup[str] | None = strawberry_django.filter_field()
+    start_address: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    end_address: StrFilterLookup[str] | None = strawberry_django.filter_field()
    size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -279,7 +279,7 @@ class IPRangeFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilter):

@strawberry_django.filter_type(models.Prefix, lookups=True)
 class PrefixFilter(ContactFilterMixin, ScopedFilterMixin, TenancyFilterMixin, PrimaryModelFilter):
-    prefix: FilterLookup[str] | None = strawberry_django.filter_field()
+    prefix: StrFilterLookup[str] | None = strawberry_django.filter_field()
    vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
    vrf_id: ID | None = strawberry_django.filter_field()
    vlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
@@ -328,7 +328,7 @@ class RoleFilter(OrganizationalModelFilter):

@strawberry_django.filter_type(models.RouteTarget, lookups=True)
 class RouteTargetFilter(TenancyFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    importing_vrfs: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -345,7 +345,7 @@ class RouteTargetFilter(TenancyFilterMixin, PrimaryModelFilter):

@strawberry_django.filter_type(models.Service, lookups=True)
 class ServiceFilter(ContactFilterMixin, ServiceFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    ip_addresses: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -357,7 +357,7 @@ class ServiceFilter(ContactFilterMixin, ServiceFilterMixin, PrimaryModelFilter):

@strawberry_django.filter_type(models.ServiceTemplate, lookups=True)
 class ServiceTemplateFilter(ServiceFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.VLAN, lookups=True)
@@ -371,7 +371,7 @@ class VLANFilter(TenancyFilterMixin, PrimaryModelFilter):
    vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
    status: BaseFilterLookup[Annotated['VLANStatusEnum', strawberry.lazy('ipam.graphql.enums')]] | None = (
        strawberry_django.filter_field()
    )
@@ -401,7 +401,7 @@ class VLANGroupFilter(ScopedFilterMixin, OrganizationalModelFilter):

@strawberry_django.filter_type(models.VLANTranslationPolicy, lookups=True)
 class VLANTranslationPolicyFilter(PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.VLANTranslationRule, lookups=True)
@@ -410,7 +410,7 @@ class VLANTranslationRuleFilter(NetBoxModelFilter):
        strawberry_django.filter_field()
    )
    policy_id: ID | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    local_vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -421,8 +421,8 @@ class VLANTranslationRuleFilter(NetBoxModelFilter):

@strawberry_django.filter_type(models.VRF, lookups=True)
 class VRFFilter(TenancyFilterMixin, PrimaryModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    rd: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    rd: StrFilterLookup[str] | None = strawberry_django.filter_field()
    enforce_unique: FilterLookup[bool] | None = strawberry_django.filter_field()
    import_targets: Annotated['RouteTargetFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
--- a/netbox/ipam/graphql/types.py
+++ b/netbox/ipam/graphql/types.py
@@ -28,23 +28,23 @@ if TYPE_CHECKING:
    from wireless.graphql.types import WirelessLANType

 __all__ = (
-    'ASNType',
    'ASNRangeType',
+    'ASNType',
    'AggregateType',
-    'FHRPGroupType',
    'FHRPGroupAssignmentType',
+    'FHRPGroupType',
    'IPAddressType',
    'IPRangeType',
    'PrefixType',
    'RIRType',
    'RoleType',
    'RouteTargetType',
-    'ServiceType',
    'ServiceTemplateType',
-    'VLANType',
+    'ServiceType',
    'VLANGroupType',
    'VLANTranslationPolicyType',
    'VLANTranslationRuleType',
+    'VLANType',
    'VRFType',
 )

--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -22,11 +22,11 @@ from netbox.models import OrganizationalModel, PrimaryModel
 from netbox.models.features import ContactsMixin

 __all__ = (
+    'RIR',
    'Aggregate',
    'IPAddress',
    'IPRange',
    'Prefix',
-    'RIR',
    'Role',
 )

@@ -432,9 +432,11 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
        ])
        available_ips = prefix - child_ips - child_ranges

-        # IPv6 /127's, pool, or IPv4 /31-/32 sets are fully usable
-        if (self.family == 6 and self.prefix.prefixlen >= 127) or self.is_pool or (
-                self.family == 4 and self.prefix.prefixlen >= 31
+        # Pool, IPv4 /31-/32 or IPv6 /127-/128 sets are fully usable
+        if (
+            self.is_pool
+            or (self.family == 4 and self.prefix.prefixlen >= 31)
+            or (self.family == 6 and self.prefix.prefixlen >= 127)
        ):
            return available_ips

--- a/netbox/ipam/models/vrfs.py
+++ b/netbox/ipam/models/vrfs.py
@@ -5,8 +5,8 @@ from ipam.constants import *
 from netbox.models import PrimaryModel

 __all__ = (
-    'RouteTarget',
    'VRF',
+    'RouteTarget',
 )


--- a/netbox/ipam/tables/asn.py
+++ b/netbox/ipam/tables/asn.py
@@ -6,8 +6,8 @@ from netbox.tables import OrganizationalModelTable, PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin

 __all__ = (
-    'ASNTable',
    'ASNRangeTable',
+    'ASNTable',
 )


--- a/netbox/ipam/tables/fhrp.py
+++ b/netbox/ipam/tables/fhrp.py
@@ -5,8 +5,8 @@ from ipam.models import *
 from netbox.tables import NetBoxTable, PrimaryModelTable, columns

 __all__ = (
-    'FHRPGroupTable',
    'FHRPGroupAssignmentTable',
+    'FHRPGroupTable',
 )


--- a/netbox/ipam/tables/vlans.py
+++ b/netbox/ipam/tables/vlans.py
@@ -18,9 +18,9 @@ __all__ = (
    'VLANGroupTable',
    'VLANMembersTable',
    'VLANTable',
-    'VLANVirtualMachinesTable',
    'VLANTranslationPolicyTable',
    'VLANTranslationRuleTable',
+    'VLANVirtualMachinesTable',
 )

 AVAILABLE_LABEL = mark_safe('<span class="badge text-bg-success">Available</span>')
--- a/netbox/ipam/tests/test_tables.py
+++ b/netbox/ipam/tests/test_tables.py
@@ -39,3 +39,132 @@ class AnnotatedIPAddressTableTest(TestCase):

        iprange_checkbox_count = html.count(f'name="pk" value="{self.ip_range.pk}"')
        self.assertEqual(iprange_checkbox_count, 0)
+
+    def test_annotate_ip_space_ipv4_non_pool_excludes_network_and_broadcast(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('192.0.2.0/29'),  # 8 addresses total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # /29 non-pool: exclude .0 (network) and .7 (broadcast)
+        self.assertEqual(available.first_ip, '192.0.2.1/29')
+        self.assertEqual(available.size, 6)
+
+    def test_annotate_ip_space_ipv4_pool_includes_network_and_broadcast(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('192.0.2.8/29'),  # 8 addresses total
+            status='active',
+            is_pool=True,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # Pool: all addresses are usable, including network/broadcast
+        self.assertEqual(available.first_ip, '192.0.2.8/29')
+        self.assertEqual(available.size, 8)
+
+    def test_annotate_ip_space_ipv4_31_includes_all_ips(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('192.0.2.16/31'),  # 2 addresses total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # /31: fully usable
+        self.assertEqual(available.first_ip, '192.0.2.16/31')
+        self.assertEqual(available.size, 2)
+
+    def test_annotate_ip_space_ipv4_32_includes_single_ip(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('192.0.2.100/32'),  # 1 address total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # /32: single usable address
+        self.assertEqual(available.first_ip, '192.0.2.100/32')
+        self.assertEqual(available.size, 1)
+
+    def test_annotate_ip_space_ipv6_non_pool_excludes_anycast_first_ip(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('2001:db8::/126'),  # 4 addresses total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        # No child records -> expect one AvailableIPSpace entry
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # For IPv6 non-pool prefixes (except /127-/128), the first address is reserved (subnet-router anycast)
+        self.assertEqual(available.first_ip, '2001:db8::1/126')
+        self.assertEqual(available.size, 3)  # 4 total - 1 reserved anycast
+
+    def test_annotate_ip_space_ipv6_127_includes_all_ips(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('2001:db8::/127'),  # 2 addresses total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # /127 is fully usable (no anycast exclusion)
+        self.assertEqual(available.first_ip, '2001:db8::/127')
+        self.assertEqual(available.size, 2)
+
+    def test_annotate_ip_space_ipv6_128_includes_single_ip(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('2001:db8::1/128'),  # 1 address total
+            status='active',
+            is_pool=False,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # /128 is fully usable (single host address)
+        self.assertEqual(available.first_ip, '2001:db8::1/128')
+        self.assertEqual(available.size, 1)
+
+    def test_annotate_ip_space_ipv6_pool_includes_anycast_first_ip(self):
+        prefix = Prefix.objects.create(
+            prefix=IPNetwork('2001:db8:1::/126'),  # 4 addresses total
+            status='active',
+            is_pool=True,
+        )
+
+        data = annotate_ip_space(prefix)
+
+        self.assertEqual(len(data), 1)
+        available = data[0]
+
+        # Pools are fully usable
+        self.assertEqual(available.first_ip, '2001:db8:1::/126')
+        self.assertEqual(available.size, 4)
--- a/netbox/ipam/ui/init.py
+++ b/netbox/ipam/ui/init.py
--- a/netbox/ipam/ui/panels.py
+++ b/netbox/ipam/ui/panels.py
@@ -0,0 +1,37 @@
+from django.contrib.contenttypes.models import ContentType
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+
+from netbox.ui import actions, panels
+
+
+class FHRPGroupAssignmentsPanel(panels.ObjectPanel):
+    """
+    A panel which lists all FHRP group assignments for a given object.
+    """
+
+    template_name = 'ipam/panels/fhrp_groups.html'
+    title = _('FHRP Groups')
+    actions = [
+        actions.AddObject(
+            'ipam.FHRPGroup',
+            url_params={
+                'return_url': lambda ctx: reverse(
+                    'ipam:fhrpgroupassignment_add',
+                    query={
+                        'interface_type': ContentType.objects.get_for_model(ctx['object']).pk,
+                        'interface_id': ctx['object'].pk,
+                    },
+                ),
+            },
+            label=_('Create Group'),
+        ),
+        actions.AddObject(
+            'ipam.FHRPGroupAssignment',
+            url_params={
+                'interface_type': lambda ctx: ContentType.objects.get_for_model(ctx['object']).pk,
+                'interface_id': lambda ctx: ctx['object'].pk,
+            },
+            label=_('Assign Group'),
+        ),
+    ]
--- a/netbox/ipam/utils.py
+++ b/netbox/ipam/utils.py
@@ -78,12 +78,21 @@ def annotate_ip_space(prefix):
    records = sorted(records, key=lambda x: x[0])

    # Determine the first & last valid IP addresses in the prefix
-    if prefix.family == 4 and prefix.mask_length < 31 and not prefix.is_pool:
+    if (
+        prefix.is_pool
+        or (prefix.family == 4 and prefix.mask_length >= 31)
+        or (prefix.family == 6 and prefix.mask_length >= 127)
+    ):
+        # Pool, IPv4 /31-/32 or IPv6 /127-/128 sets are fully usable
+        first_ip_in_prefix = netaddr.IPAddress(prefix.prefix.first)
+        last_ip_in_prefix = netaddr.IPAddress(prefix.prefix.last)
+    elif prefix.family == 4:
        # Ignore the network and broadcast addresses for non-pool IPv4 prefixes larger than /31
        first_ip_in_prefix = netaddr.IPAddress(prefix.prefix.first + 1)
        last_ip_in_prefix = netaddr.IPAddress(prefix.prefix.last - 1)
    else:
-        first_ip_in_prefix = netaddr.IPAddress(prefix.prefix.first)
+        # For IPv6 prefixes, omit the Subnet-Router anycast address (RFC 4291)
+        first_ip_in_prefix = netaddr.IPAddress(prefix.prefix.first + 1)
        last_ip_in_prefix = netaddr.IPAddress(prefix.prefix.last)

    if not records:
--- a/netbox/netbox/api/viewsets/init.py
+++ b/netbox/netbox/api/viewsets/init.py
@@ -19,8 +19,8 @@ from utilities.query import reapply_model_ordering
 from . import mixins

 __all__ = (
-    'NetBoxReadOnlyModelViewSet',
    'NetBoxModelViewSet',
+    'NetBoxReadOnlyModelViewSet',
 )

 HTTP_ACTIONS = {
--- a/netbox/netbox/choices.py
+++ b/netbox/netbox/choices.py
@@ -5,8 +5,8 @@ from utilities.constants import CSV_DELIMITERS

 __all__ = (
    'ButtonColorChoices',
-    'ColorChoices',
    'CSVDelimiterChoices',
+    'ColorChoices',
    'DistanceUnitChoices',
    'ImportFormatChoices',
    'ImportMethodChoices',
--- a/netbox/netbox/config/init.py
+++ b/netbox/netbox/config/init.py
@@ -9,10 +9,10 @@ from django.utils.translation import gettext_lazy as _
 from .parameters import PARAMS

 __all__ = (
-    'clear_config',
-    'ConfigItem',
-    'get_config',
    'PARAMS',
+    'ConfigItem',
+    'clear_config',
+    'get_config',
 )

 _thread_locals = threading.local()
--- a/netbox/netbox/events.py
+++ b/netbox/netbox/events.py
@@ -13,9 +13,9 @@ __all__ = (
    'EVENT_TYPE_KIND_SUCCESS',
    'EVENT_TYPE_KIND_WARNING',
    'EventType',
+    'get_event_text',
    'get_event_type',
    'get_event_type_choices',
-    'get_event_text',
 )


--- a/netbox/netbox/forms/mixins.py
+++ b/netbox/netbox/forms/mixins.py
@@ -10,8 +10,8 @@ from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultiple
 __all__ = (
    'ChangelogMessageMixin',
    'CustomFieldsMixin',
-    'OwnerMixin',
    'OwnerFilterMixin',
+    'OwnerMixin',
    'SavedFiltersMixin',
    'TagsMixin',
 )
--- a/netbox/netbox/graphql/filter_lookups.py
+++ b/netbox/netbox/graphql/filter_lookups.py
@@ -15,6 +15,7 @@ from strawberry_django import (
    DatetimeFilterLookup,
    FilterLookup,
    RangeLookup,
+    StrFilterLookup,
    TimeFilterLookup,
    process_filters,
 )
@@ -40,7 +41,7 @@ SKIP_MSG = 'Filter will be skipped on `null` value'

@strawberry.input(one_of=True, description='Lookup for JSON field. Only one of the lookup fields can be set.')
 class JSONLookup:
-    string_lookup: FilterLookup[str] | None = strawberry_django.filter_field()
+    string_lookup: StrFilterLookup[str] | None = strawberry_django.filter_field()
    int_range_lookup: RangeLookup[int] | None = strawberry_django.filter_field()
    int_comparison_lookup: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()
    float_range_lookup: RangeLookup[float] | None = strawberry_django.filter_field()
--- a/netbox/netbox/graphql/filter_mixins.py
+++ b/netbox/netbox/graphql/filter_mixins.py
@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Annotated, TypeVar

 import strawberry
 import strawberry_django
-from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup
+from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup, StrFilterLookup

 __all__ = (
    'DistanceFilterMixin',
@@ -48,7 +48,7 @@ class SyncedDataFilterMixin:
        strawberry_django.filter_field()
    )
    data_file_id: FilterLookup[int] | None = strawberry_django.filter_field()
-    data_path: FilterLookup[str] | None = strawberry_django.filter_field()
+    data_path: StrFilterLookup[str] | None = strawberry_django.filter_field()
    auto_sync_enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
    data_synced: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()

--- a/netbox/netbox/graphql/filters.py
+++ b/netbox/netbox/graphql/filters.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING

 import strawberry_django
 from strawberry import ID
-from strawberry_django import ComparisonFilterLookup, FilterLookup
+from strawberry_django import ComparisonFilterLookup, StrFilterLookup

 from core.graphql.filter_mixins import ChangeLoggingMixin
 from extras.graphql.filter_mixins import CustomFieldsFilterMixin, JournalEntriesFilterMixin, TagsFilterMixin
@@ -42,21 +42,21 @@ class NetBoxModelFilter(

@dataclass
 class NestedGroupModelFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
    parent_id: ID | None = strawberry_django.filter_field()


@dataclass
 class OrganizationalModelFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
-    slug: FilterLookup[str] | None = strawberry_django.filter_field()
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()


@dataclass
 class PrimaryModelFilter(NetBoxModelFilter):
-    description: FilterLookup[str] | None = strawberry_django.filter_field()
-    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    comments: StrFilterLookup[str] | None = strawberry_django.filter_field()
--- a/netbox/netbox/navigation/init.py
+++ b/netbox/netbox/navigation/init.py
@@ -4,12 +4,12 @@ from dataclasses import dataclass
 from django.urls import reverse_lazy

 __all__ = (
-    'get_model_item',
-    'get_model_buttons',
    'Menu',
    'MenuGroup',
    'MenuItem',
    'MenuItemButton',
+    'get_model_buttons',
+    'get_model_item',
 )


--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -38,9 +38,9 @@ __all__ = (
    'DistanceColumn',
    'DurationColumn',
    'LinkedCountColumn',
-    'MarkdownColumn',
-    'ManyToManyColumn',
    'MPTTColumn',
+    'ManyToManyColumn',
+    'MarkdownColumn',
    'TagColumn',
    'TemplateColumn',
    'ToggleColumn',
--- a/netbox/netbox/tables/tables.py
+++ b/netbox/netbox/tables/tables.py
@@ -53,43 +53,14 @@ class BaseTable(tables.Table):
            'class': 'table table-hover object-list',
        }

-    def __init__(self, *args, user=None, **kwargs):
-
+    # TODO: Remove user kwarg in NetBox v4.7
+    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)

        # Set default empty_text if none was provided
        if self.empty_text is None:
            self.empty_text = _("No {model_name} found").format(model_name=self._meta.model._meta.verbose_name_plural)

-        # Dynamically update the table's QuerySet to ensure related fields are pre-fetched
-        if isinstance(self.data, TableQuerysetData):
-
-            prefetch_fields = []
-            for column in self.columns:
-                if column.visible:
-                    model = getattr(self.Meta, 'model')
-                    accessor = column.accessor
-                    if accessor.startswith('custom_field_data__'):
-                        # Ignore custom field references
-                        continue
-                    prefetch_path = []
-                    for field_name in accessor.split(accessor.SEPARATOR):
-                        try:
-                            field = model._meta.get_field(field_name)
-                        except FieldDoesNotExist:
-                            break
-                        if isinstance(field, (RelatedField, ManyToOneRel)):
-                            # Follow ForeignKeys to the related model
-                            prefetch_path.append(field_name)
-                            model = field.remote_field.model
-                        elif isinstance(field, GenericForeignKey):
-                            # Can't prefetch beyond a GenericForeignKey
-                            prefetch_path.append(field_name)
-                            break
-                    if prefetch_path:
-                        prefetch_fields.append('__'.join(prefetch_path))
-            self.data.data = self.data.data.prefetch_related(*prefetch_fields)
-
    def _get_columns(self, visible=True):
        columns = []
        for name, column in self.columns.items():
@@ -145,6 +116,41 @@ class BaseTable(tables.Table):
            self.sequence.remove('actions')
            self.sequence.append('actions')

+    def _apply_prefetching(self):
+        """
+        Dynamically update the table's QuerySet to ensure related fields are pre-fetched
+        """
+        if not isinstance(self.data, TableQuerysetData):
+            return
+
+        prefetch_fields = []
+        for column in self.columns:
+            if not column.visible:
+                # Skip hidden columns
+                continue
+            model = getattr(self.Meta, 'model')  # Must be called *after* resolving columns
+            accessor = column.accessor
+            if accessor.startswith('custom_field_data__'):
+                # Ignore custom field references
+                continue
+            prefetch_path = []
+            for field_name in accessor.split(accessor.SEPARATOR):
+                try:
+                    field = model._meta.get_field(field_name)
+                except FieldDoesNotExist:
+                    break
+                if isinstance(field, (RelatedField, ManyToOneRel)):
+                    # Follow ForeignKeys to the related model
+                    prefetch_path.append(field_name)
+                    model = field.remote_field.model
+                elif isinstance(field, GenericForeignKey):
+                    # Can't prefetch beyond a GenericForeignKey
+                    prefetch_path.append(field_name)
+                    break
+            if prefetch_path:
+                prefetch_fields.append('__'.join(prefetch_path))
+        self.data.data = self.data.data.prefetch_related(*prefetch_fields)
+
    def configure(self, request):
        """
        Configure the table for a specific request context. This performs pagination and records
@@ -179,6 +185,7 @@ class BaseTable(tables.Table):
            columns = getattr(self.Meta, 'default_columns', self.Meta.fields)

        self._set_columns(columns)
+        self._apply_prefetching()
        if ordering is not None:
            self.order_by = ordering

--- a/netbox/netbox/tests/test_tables.py
+++ b/netbox/netbox/tests/test_tables.py
@@ -1,9 +1,50 @@
 from django.template import Context, Template
-from django.test import TestCase
+from django.test import RequestFactory, TestCase

-from dcim.models import Site
+from dcim.models import Device, Site
+from dcim.tables import DeviceTable
 from netbox.tables import NetBoxTable, columns
-from utilities.testing import create_tags
+from utilities.testing import create_tags, create_test_device, create_test_user
+
+
+class BaseTableTest(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        create_test_device('Test Device 1')
+        cls.user = create_test_user('testuser')
+
+    def test_prefetch_visible_columns(self):
+        """
+        Verify that the table queryset's prefetch_related lookups correspond to the user's
+        visible column preferences. Columns referencing related fields should only be
+        prefetched when those columns are visible.
+        """
+        request = RequestFactory().get('/')
+        request.user = self.user
+
+        # Scenario 1: 'rack' (simple FK) and 'region' (nested accessor: site__region) are visible
+        self.user.config.set(
+            'tables.DeviceTable.columns',
+            ['name', 'status', 'site', 'rack', 'region'],
+            commit=True,
+        )
+        table = DeviceTable(Device.objects.all())
+        table.configure(request)
+        prefetch_lookups = table.data.data._prefetch_related_lookups
+        self.assertIn('rack', prefetch_lookups)
+        self.assertIn('site__region', prefetch_lookups)
+
+        # Scenario 2: Local fields only; no prefetching
+        self.user.config.set(
+            'tables.DeviceTable.columns',
+            ['name', 'status', 'description'],
+            commit=True,
+        )
+        table = DeviceTable(Device.objects.all())
+        table.configure(request)
+        prefetch_lookups = table.data.data._prefetch_related_lookups
+        self.assertEqual(prefetch_lookups, tuple())


 class TagColumnTable(NetBoxTable):
--- a/netbox/netbox/ui/attrs.py
+++ b/netbox/netbox/ui/attrs.py
@@ -8,9 +8,10 @@ from utilities.data import resolve_attr_path
 __all__ = (
    'AddressAttr',
    'BooleanAttr',
-    'ColorAttr',
    'ChoiceAttr',
+    'ColorAttr',
    'GPSCoordinatesAttr',
+    'GenericForeignKeyAttr',
    'ImageAttr',
    'NestedObjectAttr',
    'NumericAttr',
@@ -279,6 +280,32 @@ class NestedObjectAttr(ObjectAttribute):
        }


+class GenericForeignKeyAttr(ObjectAttribute):
+    """
+    An attribute representing a related generic relation object.
+
+    This attribute is similar to `RelatedObjectAttr` but uses the
+    ContentType of the related object to be displayed alongside the value.
+
+    Parameters:
+         linkify (bool): If True, the rendered value will be hyperlinked
+             to the related object's detail view
+    """
+    template_name = 'ui/attrs/generic_object.html'
+
+    def __init__(self, *args, linkify=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.linkify = linkify
+
+    def get_context(self, obj, context):
+        value = self.get_value(obj)
+        content_type = value._meta.verbose_name
+        return {
+            'content_type': content_type,
+            'linkify': self.linkify,
+        }
+
+
 class AddressAttr(ObjectAttribute):
    """
    A physical or mailing address.
--- a/netbox/netbox/ui/panels.py
+++ b/netbox/netbox/ui/panels.py
@@ -12,6 +12,7 @@ from utilities.views import get_viewname

 __all__ = (
    'CommentsPanel',
+    'ContextTablePanel',
    'JSONPanel',
    'NestedGroupObjectPanel',
    'ObjectAttributesPanel',
@@ -339,3 +340,42 @@ class PluginContentPanel(Panel):
    def render(self, context):
        obj = context.get('object')
        return _get_registered_content(obj, self.method, context)
+
+
+class ContextTablePanel(ObjectPanel):
+    """
+    A panel which renders a django-tables2/NetBoxTable instance provided
+    via the view's extra context.
+
+    This is useful when you already have a fully constructed table
+    (custom queryset, special columns, no list view) and just want to
+    render it inside a declarative layout panel.
+
+    Parameters:
+        table (str | callable): Either the context key holding the table
+            (e.g. "vlan_table") or a callable which accepts the template
+            context and returns a table instance.
+    """
+    template_name = 'ui/panels/context_table.html'
+
+    def __init__(self, table, **kwargs):
+        super().__init__(**kwargs)
+        self.table = table
+
+    def _resolve_table(self, context):
+        if callable(self.table):
+            return self.table(context)
+        return context.get(self.table)
+
+    def get_context(self, context):
+        table = self._resolve_table(context)
+        return {
+            **super().get_context(context),
+            'table': table,
+        }
+
+    def render(self, context):
+        table = self._resolve_table(context)
+        if table is None:
+            return ''
+        return super().render(context)
--- a/netbox/netbox/views/errors.py
+++ b/netbox/netbox/views/errors.py
@@ -13,9 +13,9 @@ from django.views.generic import View
 from netbox.plugins.utils import get_installed_plugins

 __all__ = (
+    'StaticMediaFailureView',
    'handler_404',
    'handler_500',
-    'StaticMediaFailureView',
 )


--- a/netbox/netbox/views/generic/base.py
+++ b/netbox/netbox/views/generic/base.py
@@ -5,8 +5,8 @@ from django.views.generic import View
 from utilities.views import ObjectPermissionRequiredMixin

 __all__ = (
-    'BaseObjectView',
    'BaseMultiObjectView',
+    'BaseObjectView',
 )


--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -437,30 +437,12 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
        """
        return object_form.save()

-    def create_and_update_objects(self, form, request):
+    def _process_import_records(self, form, request, records, prefetched_objects):
+        """
+        Process CSV import records and save objects.
+        """
        saved_objects = []

-        records = list(form.cleaned_data['data'])
-
-        # Prefetch objects to be updated, if any
-        prefetch_ids = [int(record['id']) for record in records if record.get('id')]
-
-        # check for duplicate IDs
-        duplicate_pks = [pk for pk, count in Counter(prefetch_ids).items() if count > 1]
-        if duplicate_pks:
-            error_msg = _(
-                "Duplicate objects found: {model} with ID(s) {ids} appears multiple times"
-            ).format(
-                model=title(self.queryset.model._meta.verbose_name),
-                ids=', '.join(str(pk) for pk in sorted(duplicate_pks))
-            )
-            raise ValidationError(error_msg)
-
-        prefetched_objects = {
-            obj.pk: obj
-            for obj in self.queryset.model.objects.filter(id__in=prefetch_ids)
-        } if prefetch_ids else {}
-
        for i, record in enumerate(records, start=1):
            object_id = int(record.pop('id')) if record.get('id') else None

@@ -524,6 +506,37 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):

        return saved_objects

+    def create_and_update_objects(self, form, request):
+        records = list(form.cleaned_data['data'])
+
+        # Prefetch objects to be updated, if any
+        prefetch_ids = [int(record['id']) for record in records if record.get('id')]
+
+        # check for duplicate IDs
+        duplicate_pks = [pk for pk, count in Counter(prefetch_ids).items() if count > 1]
+        if duplicate_pks:
+            error_msg = _(
+                "Duplicate objects found: {model} with ID(s) {ids} appears multiple times"
+            ).format(
+                model=title(self.queryset.model._meta.verbose_name),
+                ids=', '.join(str(pk) for pk in sorted(duplicate_pks))
+            )
+            raise ValidationError(error_msg)
+
+        prefetched_objects = {
+            obj.pk: obj
+            for obj in self.queryset.model.objects.filter(id__in=prefetch_ids)
+        } if prefetch_ids else {}
+
+        # For MPTT models, delay tree updates until all saves are complete
+        if issubclass(self.queryset.model, MPTTModel):
+            with self.queryset.model.objects.delay_mptt_updates():
+                saved_objects = self._process_import_records(form, request, records, prefetched_objects)
+        else:
+            saved_objects = self._process_import_records(form, request, records, prefetched_objects)
+
+        return saved_objects
+
    #
    # Request handlers
    #
@@ -893,9 +906,16 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
                        renamed_pks = self._rename_objects(form, selected_objects)

                        if '_apply' in request.POST:
-                            for obj in selected_objects:
-                                setattr(obj, self.field_name, obj.new_name)
-                                obj.save()
+                            # For MPTT models, delay tree updates until all saves are complete
+                            if issubclass(self.queryset.model, MPTTModel):
+                                with self.queryset.model.objects.delay_mptt_updates():
+                                    for obj in selected_objects:
+                                        setattr(obj, self.field_name, obj.new_name)
+                                        obj.save()
+                            else:
+                                for obj in selected_objects:
+                                    setattr(obj, self.field_name, obj.new_name)
+                                    obj.save()

                            # Enforce constrained permissions
                            if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects):
--- a/netbox/netbox/views/generic/feature_views.py
+++ b/netbox/netbox/views/generic/feature_views.py
@@ -69,7 +69,6 @@ class ObjectChangeLogView(ConditionalLoginRequiredMixin, View):
        objectchanges_table = ObjectChangeTable(
            data=objectchanges,
            orderable=False,
-            user=request.user
        )
        objectchanges_table.configure(request)

@@ -153,7 +152,7 @@ class ObjectJournalView(ConditionalLoginRequiredMixin, View):
            assigned_object_type=content_type,
            assigned_object_id=obj.pk
        )
-        journalentry_table = JournalEntryTable(journalentries, user=request.user)
+        journalentry_table = JournalEntryTable(journalentries)
        journalentry_table.configure(request)
        journalentry_table.columns.hide('assigned_object_type')
        journalentry_table.columns.hide('assigned_object')
@@ -220,11 +219,7 @@ class ObjectJobsView(ConditionalLoginRequiredMixin, View):

        # Gather all Jobs for this object
        jobs = self.get_jobs(obj)
-        jobs_table = JobTable(
-            data=jobs,
-            orderable=False,
-            user=request.user
-        )
+        jobs_table = JobTable(data=jobs, orderable=False)
        jobs_table.configure(request)

        # Default to using "<app>/<model>.html" as the template, if it exists. Otherwise,
--- a/netbox/netbox/views/generic/mixins.py
+++ b/netbox/netbox/views/generic/mixins.py
@@ -92,7 +92,7 @@ class TableMixin:
                request.user.config.set(f'tables.{table}.columns', tableconfig.columns)
                request.user.config.set(f'tables.{table}.ordering', tableconfig.ordering, commit=True)

-        table = self.table(data, user=request.user)
+        table = self.table(data)
        if 'pk' in table.base_columns and bulk_actions:
            table.columns.show('pk')
        table.configure(request)
--- a/netbox/project-static/dist/netbox.css
+++ b/netbox/project-static/dist/netbox.css
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
bctiemann	983ba4fda8	Merge pull request #21562 from netbox-community/release-v4.5.4 Release v4.5.4	2026-03-03 15:07:18 -05:00
Jeremy Stretch	54462595a6	Release v4.5.4	2026-03-03 12:46:15 -05:00
Jeremy Stretch	8ab752b9ad	Closes #21451 : Upgrade tom-select to v2.5.2 (#21563 )	2026-03-03 18:35:36 +01:00
Jeremy Stretch	b11cc31f9d	Closes #21559 : Add CLAUDE.md	2026-03-03 12:01:33 -05:00
Martin Hauser	3f02309538	fix(ipam): Avoid allocating IPv6 subnet-router anycast address (#21547 ) Ensure available IP selection for IPv6 non-pool prefixes excludes the subnet-router anycast address (RFC 4291), so allocation starts at ::1 for typical prefixes (e.g. /64). Add tests for IPv4/IPv6 pools and special cases (/31-/32, /127-/128). Fixes #21347	2026-03-03 08:26:44 -08:00
Martin Hauser	53345f194a	refactor(graphql): Replace FilterLookup[str] with StrFilterLookup Replace usages of FilterLookup[str] with StrFilterLookup in GraphQL filter definitions to align with strawberry-graphql-django v0.75.1. This silences upstream warnings and helps avoid DuplicatedTypeName errors. Fixes #21450	2026-03-03 11:17:13 -05:00
Jeremy Stretch	139557b8dd	Fixes #21524 : Fix IndexError when serializing stale cable paths (#21525 )	2026-03-03 16:37:45 +01:00
bctiemann	fcf02bd8bb	Merge pull request #21453 from netbox-community/21429-cable-create-add-another-does-not-carry-over-termination Fixes #21429: Add Cable cloning and fix "Create & Add Another" to preserve Termination Types	2026-03-03 09:44:35 -05:00
Martin Hauser	7d6989ff34	Closes #21477 : Add cached relation filters to GraphQL for Cable (#21506 )	2026-03-03 08:01:45 -06:00
Arthur Hanson	3b0b95c265	Closes #21550 : Call snapshot() before saving related objects (#21551 ) Add missing pre-change `snapshot()` calls in views/forms before updating and saving related objects (device bays, virtual chassis members, and bulk-import primary MAC/IP assignments), so changelog entries include pre-change data.	2026-03-03 14:01:04 +01:00
github-actions	cdc2fb2f06	Update source translation strings	2026-03-03 05:20:47 +00:00
Jeremy Stretch	7ec656bc7c	Introduce GitHub actions for Claude Code review (#21545 )	2026-03-02 10:39:23 -06:00
Rob Duffy	06bbae0f84	Fixes #21527 : UI Bug with Displaying Primary IP Address with NAT IP on a Device	2026-03-02 08:57:52 -05:00
Arthur Hanson	8ff9fd26d1	Closes #20787 : Address warnings from generation of OpenAPI schema (#21521 )	2026-03-02 14:38:39 +01:00
github-actions	a0e23ac3c9	Update source translation strings	2026-02-28 05:11:26 +00:00
Jeremy Stretch	071d4a63aa	Fixes #21518 : Ensure proper display of decimal custom fields with a zero value (#21523 )	2026-02-27 09:13:53 -08:00
github-actions	7db2739465	Update source translation strings	2026-02-26 05:25:45 +00:00
Dave Bevan	74326edc20	Add new Ethernet types for 10GE and 40GE Closes #21394	2026-02-25 16:34:00 -05:00
Grische	2ef21f7097	Fixes: #21456 - Improve config_context rendering with GraphQL (#21495 )	2026-02-25 16:17:04 -05:00
Kartik	3adcdc34c3	clarify E501 enforcement	2026-02-25 15:33:25 -05:00
Martin Hauser	f33109e485	fix(dcim): Rename `facility` to `facility_id` in panel attrs (#21482 ) Corrects field mismatch by aligning the attribute name with the data model. This change ensures consistency in attribute mappings and improves clarity in the codebase. Fixes #21481	2026-02-25 12:20:51 -08:00
github-actions	d10453883f	Update source translation strings	2026-02-21 05:16:36 +00:00
bctiemann	6dbd8f6170	Merge pull request #21507 from netbox-community/21497-pin-ruff-in-ci-to-avoid-surprise-breakages Fixes #21497: Pin Ruff 0.15.2 and run CI via ruff-action	2026-02-20 16:59:46 -05:00
Jason Novinger	715f9d150c	Closes #21385 : Add contact assignment support to virtual circuits Adds ContactsMixin to VirtualCircuit model and GraphQL type, and includes 'contacts' in table fields. Verified: UI Contacts tab, REST API POST (201), GraphQL contacts query.	2026-02-20 16:59:37 -05:00
Martin Hauser	f4567ba099	chore(ci): Pin Ruff 0.15.2 and run via ruff-action Pin Ruff to v0.15.2 in CI and pre-commit to avoid breakages from upstream releases. Run Ruff via astral-sh/ruff-action (pinned by SHA) instead of installing Ruff via pip. Document where Ruff is pinned and keep the release checklist/style guide in sync. Fixes #21472 Fixes #21497	2026-02-20 20:38:11 +01:00
Jeremy Stretch	d5e8f7dafa	Closes #21459 : Avoid prefetching data for hidden table columns (#21460 )	2026-02-20 10:36:46 -08:00
Jeremy Stretch	32e2a17c88	Merge pull request #21503 from netbox-community/21500-enable-linting-for-all-ordering-ruf022 Closes #21500: Enable RUF022 to enforce sorted `__all__` lists	2026-02-20 11:52:00 -05:00
Martin Hauser	3beef34355	chore(ruff): Sort `__all__` definitions across modules Apply consistent alphabetical ordering to `__all__` lists in the circuits module. Enhances readability and alignment with established linting guidelines.	2026-02-20 15:36:01 +01:00
Martin Hauser	85d6242962	chore(ruff): Add RUF022 and tweak formatting in ruff.toml Enable `RUF022` to enforce sorted `__all__` lists. Adjust comment alignment and whitespace for improved readability and consistency in ruff.toml configuration.	2026-02-20 15:34:58 +01:00
bctiemann	bb1a44d35b	Merge pull request #21479 from netbox-community/21478-graphql-union-type-resolution-for-connected-endpoints Fixes #21478: Fix GraphQL connected endpoint type resolution for Console Ports	2026-02-20 09:27:36 -05:00
bctiemann	ae6f1f9ae3	Merge pull request #21496 from netbox-community/20923-convert-virtualization-views-to-new-ui-layout Closes #20923: Migrate Virtualization object views to declarative layouts	2026-02-20 09:26:56 -05:00
Arthur Hanson	915ac90119	20911 Fix sorting in dropdown (#21101 ) * Fix TomSelect dropdown ordering * cleanup * cleanup * cleanup * use correct node version * change ordering field, remove front-end changes * rebuild tree after rename * add migration * fix migration * fix migration * fix migration * fix migration * fix migration * cleanup * use bulk_update and rebuild * use bulk_update and rebuild * cleanup * fix csv import * Review feedback * Review feedback * fix dropdown sorting * fix ordering * review feedback * review feedback	2026-02-20 09:03:47 -05:00
Martin Hauser	cc47afc401	refactor(virtualization): Port to declarative layout Add declarative layout panels for Cluster, Cluster Group, Cluster Type, Virtual Disk, and VM Interface, including addressing, VLAN assignment, and FHRP group handling. Expand the declarative layout primitives: - add GFK attribute rendering support - add panel for rendering context-provided tables - update templates to support new panels/attrs Closes #20923	2026-02-20 14:58:20 +01:00
Martin Hauser	20fee95a9a	Closes #21499 : Restore deterministic Ruff linting (match Ruff 0.15.1 preview defaults) Explicitly set `select` rules to maintain compatibility with Ruff 0.15.1. Ensures deterministic linting behavior despite changes in Ruff 0.15.2 defaults. See https://github.com/astral-sh/ruff/releases/tag/0.15.2 for more details.	2026-02-20 14:40:45 +01:00
github-actions	d2002c64b4	Update source translation strings	2026-02-20 05:23:09 +00:00
Martin Hauser	e84b062393	fix(dcim): Correct type check for ConsolePort in GraphQL mixin Fixes a typo in the `resolve_type` method where `ConsolePortType` was mistakenly referenced instead of `ConsolePort`. Ensures the correct GraphQL type is returned for ConsolePort instances. Fixes #21478	2026-02-18 23:19:36 +01:00
Martin Hauser	951d856c3c	feat(dcim): Add Cable cloning with Termination mapping Introduce `clone()` method for the Cable model to enable cloning its attributes, including termination type and parent selectors. Updates mappings to align with CableForm workflows, supporting "Clone" and "Create & Add Another" actions. Fixes #21429	2026-02-17 18:30:36 +01:00