Reindex migrations

Add migrations to remove indexes and alter field collations
Use case-insensitive collations on fields considered for uniqueness
2026-01-10 13:52:17 -06:00 · 2025-10-24 15:25:45 -04:00 · 2025-10-24 15:23:58 -04:00 · 2025-10-24 15:23:58 -04:00 · 2025-10-24 15:23:58 -04:00
476 changed files with 28933 additions and 52875 deletions
--- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml
@@ -2,7 +2,7 @@
 name: ✨ Feature Request
 type: Feature
 description: Propose a new NetBox feature or enhancement
-labels: ["netbox", "type: feature", "status: needs triage"]
+labels: ["type: feature", "status: needs triage"]
 body:
  - type: markdown
    attributes:
@@ -15,7 +15,7 @@ body:
    attributes:
      label: NetBox version
      description: What version of NetBox are you currently running?
-      placeholder: v4.4.7
+      placeholder: v4.4.4
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml
@@ -2,7 +2,7 @@
 name: 🐛 Bug Report
 type: Bug
 description: Report a reproducible bug in the current release of NetBox
-labels: ["netbox", "type: bug", "status: needs triage"]
+labels: ["type: bug", "status: needs triage"]
 body:
  - type: markdown
    attributes:
@@ -27,7 +27,7 @@ body:
    attributes:
      label: NetBox Version
      description: What version of NetBox are you currently running?
-      placeholder: v4.4.7
+      placeholder: v4.4.4
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/03-documentation_change.yaml
+++ b/.github/ISSUE_TEMPLATE/03-documentation_change.yaml
@@ -2,7 +2,7 @@
 name: 📖 Documentation Change
 type: Documentation
 description: Suggest an addition or modification to the NetBox documentation
-labels: ["netbox", "type: documentation", "status: needs triage"]
+labels: ["type: documentation", "status: needs triage"]
 body:
  - type: dropdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/04-translation.yaml
+++ b/.github/ISSUE_TEMPLATE/04-translation.yaml
@@ -2,7 +2,7 @@
 name: 🌍 Translation
 type: Translation
 description: Request support for a new language in the user interface
-labels: ["netbox", "type: translation"]
+labels: ["type: translation"]
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/05-housekeeping.yaml
+++ b/.github/ISSUE_TEMPLATE/05-housekeeping.yaml
@@ -2,7 +2,7 @@
 name: 🏡 Housekeeping
 type: Housekeeping
 description: A change pertaining to the codebase itself (developers only)
-labels: ["netbox", "type: housekeeping"]
+labels: ["type: housekeeping"]
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/06-deprecation.yaml
+++ b/.github/ISSUE_TEMPLATE/06-deprecation.yaml
@@ -2,7 +2,7 @@
 name: 🗑️ Deprecation
 type: Deprecation
 description: The removal of an existing feature or resource
-labels: ["netbox", "type: deprecation"]
+labels: ["type: deprecation"]
 body:
  - type: textarea
    attributes:
--- 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.6.9
  hooks:
    - id: ruff
      name: "Ruff linter"
@@ -21,6 +21,14 @@ repos:
      language: system
      pass_filenames: false
      types: [python]
+    - id: openapi-check
+      name: "Validate OpenAPI schema"
+      description: "Check for any unexpected changes to the OpenAPI schema"
+      files: api/.*\.py$
+      entry: scripts/verify-openapi.sh
+      language: system
+      pass_filenames: false
+      types: [python]
    - id: mkdocs-build
      name: "Build documentation"
      description: "Build the documentation with mkdocs"
--- a/contrib/generated_schema.json
+++ b/contrib/generated_schema.json
@@ -186,7 +186,6 @@
                        "usb-3-micro-b",
                        "molex-micro-fit-1x2",
                        "molex-micro-fit-2x2",
-                        "molex-micro-fit-2x3",
                        "molex-micro-fit-2x4",
                        "dc-terminal",
                        "saf-d-grid",
@@ -294,7 +293,6 @@
                        "usb-c",
                        "molex-micro-fit-1x2",
                        "molex-micro-fit-2x2",
-                        "molex-micro-fit-2x3",
                        "molex-micro-fit-2x4",
                        "dc-terminal",
                        "eaton-c39",
--- a/contrib/openapi.json
+++ b/contrib/openapi.json
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -35,7 +35,6 @@ Some configuration parameters are primarily controlled via NetBox's admin interf
 * [`POWERFEED_DEFAULT_MAX_UTILIZATION`](./default-values.md#powerfeed_default_max_utilization)
 * [`POWERFEED_DEFAULT_VOLTAGE`](./default-values.md#powerfeed_default_voltage)
 * [`PREFER_IPV4`](./miscellaneous.md#prefer_ipv4)
-* [`PROTECTION_RULES`](./data-validation.md#protection_rules)
 * [`RACK_ELEVATION_DEFAULT_UNIT_HEIGHT`](./default-values.md#rack_elevation_default_unit_height)
 * [`RACK_ELEVATION_DEFAULT_UNIT_WIDTH`](./default-values.md#rack_elevation_default_unit_width)

--- a/docs/configuration/miscellaneous.md
+++ b/docs/configuration/miscellaneous.md
@@ -53,16 +53,6 @@ Sets content for the top banner in the user interface.

 ---

-## COPILOT_ENABLED
-
-!!! tip "Dynamic Configuration Parameter"
-
-Default: `True`
-
-Enables or disables the [NetBox Copilot](https://netboxlabs.com/docs/copilot/) agent globally. When enabled, users can opt to toggle the agent individually.
-
---
-
 ## CENSUS_REPORTING_ENABLED

 Default: `True`
--- a/docs/configuration/security.md
+++ b/docs/configuration/security.md
@@ -81,7 +81,7 @@ If `True`, the cookie employed for cross-site request forgery (CSRF) protection

 Default: `[]`

-Defines a list of trusted origins for unsafe (e.g. `POST`) requests. This is a pass-through to Django's [`CSRF_TRUSTED_ORIGINS`](https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins) setting. Note that each host listed must specify a scheme (e.g. `http://` or `https://`).
+Defines a list of trusted origins for unsafe (e.g. `POST`) requests. This is a pass-through to Django's [`CSRF_TRUSTED_ORIGINS`](https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins) setting. Note that each host listed must specify a scheme (e.g. `http://` or `https://).

 ```python
 CSRF_TRUSTED_ORIGINS = (
--- a/docs/configuration/system.md
+++ b/docs/configuration/system.md
@@ -232,9 +232,6 @@ STORAGES = {
    },
    "scripts": {
        "BACKEND": "extras.storage.ScriptFileSystemStorage",
-        "OPTIONS": {
-            "allow_overwrite": True,
-        },
    },
 }
 ```
@@ -250,7 +247,6 @@ STORAGES = {
        "OPTIONS": { 
            'access_key': 'access key', 
            'secret_key': 'secret key',
-            "allow_overwrite": True,
        }
    }, 
 }
--- a/docs/customization/custom-scripts.md
+++ b/docs/customization/custom-scripts.md
@@ -95,7 +95,7 @@ An example fieldset definition is provided below:

 ```python
 class MyScript(Script):
-    class Meta(Script.Meta):
+    class Meta:
        fieldsets = (
            ('First group', ('field1', 'field2', 'field3')),
            ('Second group', ('field4', 'field5')),
@@ -393,61 +393,6 @@ A complete date & time. Returns a `datetime.datetime` object.

 Custom scripts can be run via the web UI by navigating to the script, completing any required form data, and clicking the "run script" button. It is possible to schedule a script to be executed at specified time in the future. A scheduled script can be canceled by deleting the associated job result object.

-#### Prefilling variables via URL parameters
-
-Script form fields can be prefilled by appending query parameters to the script URL. Each parameter name must match the variable name defined on the script class. Prefilled values are treated as initial values and can be edited before execution. Multiple values can be supplied by repeating the same parameter. Query values must be percent‑encoded where required (for example, spaces as `%20`).
-
-Examples:
-
-For string and integer variables, when a script defines:
-
-```python
-from extras.scripts import Script, StringVar, IntegerVar
-
-class MyScript(Script):
-    name = StringVar()
-    count = IntegerVar()
-```
-
-the following URL prefills the `name` and `count` fields:
-
-```
-https://<netbox>/extras/scripts/<script_id>/?name=Branch42&count=3
-```
-
-For object variables (`ObjectVar`), supply the object’s primary key (PK):
-
-```
-https://<netbox>/extras/scripts/<script_id>/?device=1
-```
-
-If an object ID cannot be resolved or the object is not visible to the requesting user, the field remains unpopulated.
-
-Supported variable types:
-
-| Variable class           | Expected input                  | Example query string                        |
-|--------------------------|---------------------------------|---------------------------------------------|
-| `StringVar`              | string (percent‑encoded)        | `?name=Branch42`                            |
-| `TextVar`                | string (percent‑encoded)        | `?notes=Initial%20value`                    |
-| `IntegerVar`             | integer                         | `?count=3`                                  |
-| `DecimalVar`             | decimal number                  | `?ratio=0.75`                               |
-| `BooleanVar`             | value → `True`; empty → `False` | `?enabled=true` (True), `?enabled=` (False) |
-| `ChoiceVar`              | choice value (not label)        | `?role=edge`                                |
-| `MultiChoiceVar`         | choice values (repeat)          | `?roles=edge&roles=core`                    |
-| `ObjectVar(Device)`      | PK (integer)                    | `?device=1`                                 |
-| `MultiObjectVar(Device)` | PKs (repeat)                    | `?devices=1&devices=2`                      |
-| `IPAddressVar`           | IP address                      | `?ip=198.51.100.10`                         |
-| `IPAddressWithMaskVar`   | IP address with mask            | `?addr=192.0.2.1/24`                        |
-| `IPNetworkVar`           | IP network prefix               | `?network=2001:db8::/64`                    |
-| `DateVar`                | date `YYYY-MM-DD`               | `?date=2025-01-05`                          |
-| `DateTimeVar`            | ISO datetime                    | `?when=2025-01-05T14:30:00`                 |
-| `FileVar`                | — (not supported)               | —                                           |
-
-!!! note
-    - The parameter names above are examples; use the actual variable attribute names defined by the script.
-    - For `BooleanVar`, only an empty value (`?enabled=`) unchecks the box; any other value including `false` or `0` checks it.
-    - File uploads (`FileVar`) cannot be prefilled via URL parameters.
-
 ### Via the API

 To run a script via the REST API, issue a POST request to the script's endpoint specifying the form data and commitment. For example, to run a script named `example.MyReport`, we would make a request such as the following:
@@ -499,7 +444,7 @@ from extras.scripts import *

 class NewBranchScript(Script):

-    class Meta(Script.Meta):
+    class Meta:
        name = "New Branch"
        description = "Provision a new branch site"
        field_order = ['site_name', 'switch_count', 'switch_model']
--- a/docs/development/user-preferences.md
+++ b/docs/development/user-preferences.md
@@ -6,14 +6,10 @@ For end‑user guidance on resetting saved table layouts, see [Features > User P

 ## Available Preferences

-| Name                       | Description                                                   |
-|----------------------------|---------------------------------------------------------------|
-| `csv_delimiter`            | The delimiting character used when exporting CSV data         |
-| `data_format`              | Preferred format when rendering raw data (JSON or YAML)       |
-| `locale.language`          | The language selected for UI translation                      |
-| `pagination.per_page`      | The number of items to display per page of a paginated table  |
-| `pagination.placement`     | Where to display the paginator controls relative to the table |
-| `tables.${table}.columns`  | The ordered list of columns to display when viewing the table |
-| `tables.${table}.ordering` | A list of column names by which the table should be ordered   |
-| `ui.copilot_enabled`       | Toggles the NetBox Copilot AI agent                           |
-| `ui.tables.striping`       | Toggles visual striping of tables in the UI                   |
+| Name                     | Description                                                   |
+|--------------------------|---------------------------------------------------------------|
+| data_format              | Preferred format when rendering raw data (JSON or YAML)       |
+| pagination.per_page      | The number of items to display per page of a paginated table  |
+| pagination.placement     | Where to display the paginator controls relative to the table |
+| tables.${table}.columns  | The ordered list of columns to display when viewing the table |
+| tables.${table}.ordering | A list of column names by which the table should be ordered   |
--- a/docs/features/resource-ownership.md
+++ b/docs/features/resource-ownership.md
@@ -1,10 +0,0 @@
-# Resource Ownership
-
-!!! info "This feature was introduced in NetBox v4.5."
-
-Most objects in NetBox can be assigned an owner. An owner is a set of users and/or groups who are responsible for the administration of associated objects. For example, you might designate the operations team at a site as the owner for all prefixes and VLANs deployed at that site. The users and groups assigned to an owner are referred to as its members.
-
-!!! note
-    Ownership of an object should not be confused with the concept of [tenancy](./tenancy.md), which indicates the dedication of an object to a specific tenant. For instance, a tenant might represent a customer served by the object, whereas an owner typically represents a set of internal users responsible for the management of the object.
-
-Owners can be organized into groups for easier management.
--- a/docs/features/tenancy.md
+++ b/docs/features/tenancy.md
@@ -1,6 +1,6 @@
 # Tenancy

-Most core objects within NetBox's data model support _tenancy_. This is the association of an object with a particular tenant to convey assignment or dependency. For example, an enterprise might represent its internal business units as tenants, whereas a managed services provider might create a tenant in NetBox to represent each of its customers.
+Most core objects within NetBox's data model support _tenancy_. This is the association of an object with a particular tenant to convey ownership or dependency. For example, an enterprise might represent its internal business units as tenants, whereas a managed services provider might create a tenant in NetBox to represent each of its customers.

 ```mermaid
 flowchart TD
@@ -19,36 +19,20 @@ Tenants can be grouped by any logic that your use case demands, and groups can b

 Typically, the tenant model is used to represent a customer or internal organization, however it can be used for whatever purpose meets your needs.

-Most core objects within NetBox can be assigned to a particular tenant, so this model provides a very convenient way to correlate resource allocation across object types. For example, each of your customers might have its own racks, devices, IP addresses, circuits and so on: These can all be easily tracked via tenant assignment.
+Most core objects within NetBox can be assigned to particular tenant, so this model provides a very convenient way to correlate ownership across object types. For example, each of your customers might have its own racks, devices, IP addresses, circuits and so on: These can all be easily tracked via tenant assignment.

 The following objects can be assigned to tenants:

-* Circuits
-* Circuit groups
-* Virtual circuits
-* Cables
-* Devices
-* Virtual device contexts
-* Power feeds
+* Sites
 * Racks
 * Rack reservations
-* Sites
-* Locations
-* ASNs
-* ASN ranges
-* Aggregates
+* Devices
+* VRFs
 * Prefixes
-* IP ranges
 * IP addresses
 * VLANs
-* VLAN groups
-* VRFs
-* Route targets
+* Circuits
 * Clusters
 * Virtual machines
-* L2VPNs
-* Tunnels
-* Wireless LANs
-* Wireless links

-Tenancy represents the dedication of an object to a specific tenant. As such, each object may only be assigned to a single tenant. For example, if you have a firewall dedicated to a particular customer, you would assign it to the tenant which represents that customer. However, if the firewall serves multiple customers, it doesn't *belong* to any particular customer, so the assignment of a tenant would not be appropriate.
+Tenant assignment is used to signify the ownership of an object in NetBox. As such, each object may only be owned by a single tenant. For example, if you have a firewall dedicated to a particular customer, you would assign it to the tenant which represents that customer. However, if the firewall serves multiple customers, it doesn't *belong* to any particular customer, so tenant assignment would not be appropriate.
--- a/docs/models/dcim/cable.md
+++ b/docs/models/dcim/cable.md
@@ -21,21 +21,6 @@ The cable's operational status. Choices include:
 * Planned
 * Decommissioning

-### Profile
-
-!!! note "This field was introduced in NetBox v4.5."
-
-The profile to which the cable conforms. The profile determines the mapping of termination between the two ends and enables logical tracing across complex connections, such as breakout cables. Supported profiles are listed below.
-
-* Straight (single position)
-* Straight (multi-position)
-* Shuffle (2x2 MPO8)
-* Shuffle (4x4 MPO8)
-
-A single-position cable is allowed only one termination point at each end. There is no limit to the number of terminations a multi-position cable may have. Each end of a cable must have the same number of terminations, unless connected to a pass-through port or to a circuit termination.
-
-The assignment of a cable profile is optional. If no profile is assigned, legacy tracing behavior will be preserved.
-
 ### Type

 The cable's physical medium or classification.
--- a/docs/models/users/owner.md
+++ b/docs/models/users/owner.md
@@ -1,23 +0,0 @@
-# Owner
-
-An owner is a set of users and/or groups who are responsible for the administration of certain resources within NetBox. The users and groups assigned to an owner are referred to as its members. Owner assignments are useful for indicating which parties are responsible for the administration of a particular object.
-
-Most objects within NetBox can be assigned an owner, although this is not required.
-
-## Fields
-
-### Name
-
-The owner's name.
-
-### Group
-
-The [group](./ownergroup.md) to which the owner is assigned. The assignment of an owner to a group is optional.
-
-### User Groups
-
-Groups of users that are members of the owner.
-
-### Users
-
-Individual users that are members of the owner.
--- a/docs/models/users/ownergroup.md
+++ b/docs/models/users/ownergroup.md
@@ -1,9 +0,0 @@
-# Owner Groups
-
-Groups are used to correlate and organize [owners](./owner.md). The assignment of an owner to a group has no bearing on the relationship of owned objects to their owners.
-
-## Fields
-
-### Name
-
-The name of the group.
--- a/docs/models/virtualization/virtualmachine.md
+++ b/docs/models/virtualization/virtualmachine.md
@@ -21,13 +21,6 @@ The VM's operational status.
 !!! tip
    Additional statuses may be defined by setting `VirtualMachine.status` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter.

-### Start on boot
-
-The start on boot setting from the hypervisor.
-
-!!! tip
-    Additional statuses may be defined by setting `VirtualMachine.start_on_boot` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter.
-
 ### Site & Cluster

 The [site](../dcim/site.md) and/or [cluster](./cluster.md) to which the VM is assigned.
--- a/docs/plugins/development/background-jobs.md
+++ b/docs/plugins/development/background-jobs.md
@@ -60,13 +60,6 @@ Four of the standard Python logging levels are supported:

 Log entries recorded using the runner's logger will be saved in the job's log in the database in addition to being processed by other [system logging handlers](../../configuration/system.md#logging).

-### Jobs running for Model instances
-
-A Job can be executed for a specific instance of a Model.
-To enable this functionality, the model must include the `JobsMixin`.
-
-When enqueuing a Job, you can associate it with a particular instance by passing that instance to the `instance` parameter.
-
 ### Scheduled Jobs

 As described above, jobs can be scheduled for immediate execution or at any later time using the `enqueue()` method. However, for management purposes, the `enqueue_once()` method allows a job to be scheduled exactly once avoiding duplicates. If a job is already scheduled for a particular instance, a second one won't be scheduled, respecting thread safety. An example use case would be to schedule a periodic task that is bound to an instance in general, but not to any event of that instance (such as updates). The parameters of the `enqueue_once()` method are identical to those of `enqueue()`.
@@ -80,10 +73,9 @@ As described above, jobs can be scheduled for immediate execution or at any late
 from django.db import models
 from core.choices import JobIntervalChoices
 from netbox.models import NetBoxModel
-from netbox.models.features import JobsMixin
 from .jobs import MyTestJob

-class MyModel(JobsMixin, NetBoxModel):
+class MyModel(NetBoxModel):
    foo = models.CharField()

    def save(self, *args, **kwargs):
--- a/docs/plugins/development/filtersets.md
+++ b/docs/plugins/development/filtersets.md
@@ -55,27 +55,6 @@ class MyModelViewSet(...):
    filterset_class = filtersets.MyModelFilterSet
 ```

-### Implementing Quick Search
-
-The `ObjectListView` has a field called Quick Search. For Quick Search to work the corresponding FilterSet has to override the `search` method that is implemented in `NetBoxModelFilterSet`. This function takes a queryset and can perform arbitrary operations on it and return it. A common use-case is to search for the given search value in multiple fields:
-
-```python
-from django.db.models import Q
-from netbox.filtersets import NetBoxModelFilterSet
-
-class MyFilterSet(NetBoxModelFilterSet):
-    ...
-    def search(self, queryset, name, value):
-        if not value.strip():
-            return queryset
-        return queryset.filter(
-            Q(name__icontains=value) |
-            Q(description__icontains=value)
-        )
-```
-
-The `search` method is also used by the `q` filter in `NetBoxModelFilterSet` which in turn is used by the Search field in the filters tab.
-
 ## Filter Classes

 ### TagFilter
--- a/docs/plugins/development/ui-components.md
+++ b/docs/plugins/development/ui-components.md
@@ -1,148 +0,0 @@
-# UI Components
-
-!!! note "New in NetBox v4.5"
-    All UI components described here were introduced in NetBox v4.5. Be sure to set the minimum NetBox version to 4.5.0 for your plugin before incorporating any of these resources.
-
-!!! danger "Beta Feature"
-    UI components are considered a beta feature, and are still under active development. Please be aware that the API for resources on this page is subject to change in future releases.
-
-To simply the process of designing your plugin's user interface, and to encourage a consistent look and feel throughout the entire application, NetBox provides a set of components that enable programmatic UI design. These make it possible to declare complex page layouts with little or no custom HTML.
-
-## Page Layout
-
-A layout defines the general arrangement of content on a page into rows and columns. The layout is defined under the [view](./views.md) and declares a set of rows, each of which may have one or more columns. Below is an example layout.
-
-```
-+-------+-------+-------+
-| Col 1 | Col 2 | Col 3 |
-+-------+-------+-------+
-|         Col 4         |
-+-----------+-----------+
-|   Col 5   |   Col 6   |
-+-----------+-----------+
-```
-
-The above layout can be achieved with the following declaration under a view:
-
-```python
-from netbox.ui import layout
-from netbox.views import generic
-
-class MyView(generic.ObjectView):
-    layout = layout.Layout(
-        layout.Row(
-            layout.Column(),
-            layout.Column(),
-            layout.Column(),
-        ),
-        layout.Row(
-            layout.Column(),
-        ),
-        layout.Row(
-            layout.Column(),
-            layout.Column(),
-        ),
-    )
-```
-
-!!! note
-    Currently, layouts are supported only for subclasses of [`generic.ObjectView`](./views.md#netbox.views.generic.ObjectView).
-
-::: netbox.ui.layout.Layout
-
-::: netbox.ui.layout.SimpleLayout
-
-::: netbox.ui.layout.Row
-
-::: netbox.ui.layout.Column
-
-## Panels
-
-Within each column, related blocks of content are arranged into panels. Each panel has a title and may have a set of associated actions, but the content within is otherwise arbitrary.
-
-Plugins can define their own panels by inheriting from the base class `netbox.ui.panels.Panel`. Override the `get_context()` method to pass additional context to your custom panel template. An example is provided below.
-
-```python
-from django.utils.translation import gettext_lazy as _
-from netbox.ui.panels import Panel
-
-class RecentChangesPanel(Panel):
-    template_name = 'my_plugin/panels/recent_changes.html'
-    title = _('Recent Changes')
-
-    def get_context(self, context):
-        return {
-            **super().get_context(context),
-            'changes': get_changes()[:10],
-        }
-```
-
-NetBox also includes a set of panels suite for specific uses, such as display object details or embedding a table of related objects. These are listed below.
-
-::: netbox.ui.panels.Panel
-
-::: netbox.ui.panels.ObjectPanel
-
-::: netbox.ui.panels.ObjectAttributesPanel
-
-#### Object Attributes
-
-The following classes are available to represent object attributes within an ObjectAttributesPanel. Additionally, plugins can subclass `netbox.ui.attrs.ObjectAttribute` to create custom classes.
-
-| Class                                | Description                                      |
-|--------------------------------------|--------------------------------------------------|
-| `netbox.ui.attrs.AddressAttr`        | A physical or mailing address.                   |
-| `netbox.ui.attrs.BooleanAttr`        | A boolean value                                  |
-| `netbox.ui.attrs.ColorAttr`          | A color expressed in RGB                         |
-| `netbox.ui.attrs.ChoiceAttr`         | A selection from a set of choices                |
-| `netbox.ui.attrs.GPSCoordinatesAttr` | GPS coordinates (latitude and longitude)         |
-| `netbox.ui.attrs.ImageAttr`          | An attached image (displays the image)           |
-| `netbox.ui.attrs.NestedObjectAttr`   | A related nested object                          |
-| `netbox.ui.attrs.NumericAttr`        | An integer or float value                        |
-| `netbox.ui.attrs.RelatedObjectAttr`  | A related object                                 |
-| `netbox.ui.attrs.TemplatedAttr`      | Renders an attribute using a custom template     |
-| `netbox.ui.attrs.TextAttr`           | A string (text) value                            |
-| `netbox.ui.attrs.TimezoneAttr`       | A timezone with annotated offset                 |
-| `netbox.ui.attrs.UtilizationAttr`    | A numeric value expressed as a utilization graph |
-
-::: netbox.ui.panels.OrganizationalObjectPanel
-
-::: netbox.ui.panels.NestedGroupObjectPanel
-
-::: netbox.ui.panels.CommentsPanel
-
-::: netbox.ui.panels.JSONPanel
-
-::: netbox.ui.panels.RelatedObjectsPanel
-
-::: netbox.ui.panels.ObjectsTablePanel
-
-::: netbox.ui.panels.TemplatePanel
-
-::: netbox.ui.panels.PluginContentPanel
-
-## Panel Actions
-
-Each panel may have actions associated with it. These render as links or buttons within the panel header, opposite the panel's title. For example, a common use case is to include an "Add" action on a panel which displays a list of objects. Below is an example of this.
-
-```python
-from django.utils.translation import gettext_lazy as _
-from netbox.ui import actions, panels
-
-panels.ObjectsTablePanel(
-    model='dcim.Region',
-    title=_('Child Regions'),
-    filters={'parent_id': lambda ctx: ctx['object'].pk},
-    actions=[
-        actions.AddObject('dcim.Region', url_params={'parent': lambda ctx: ctx['object'].pk}),
-    ],
-),
-```
-
-::: netbox.ui.actions.PanelAction
-
-::: netbox.ui.actions.LinkAction
-
-::: netbox.ui.actions.AddObject
-
-::: netbox.ui.actions.CopyContent
--- a/docs/release-notes/version-4.4.md
+++ b/docs/release-notes/version-4.4.md
@@ -1,94 +1,5 @@
 # NetBox v4.4

-## v4.4.7 (2025-11-25)
-
-### Enhancements
-
-* [#20371](https://github.com/netbox-community/netbox/issues/20371) - Add Molex Micro-Fit 2x3 for power ports & power outlets
-* [#20731](https://github.com/netbox-community/netbox/issues/20731) - Enable specifying `data_source` & `data_file` when bulk import config templates
-* [#20820](https://github.com/netbox-community/netbox/issues/20820) - Enable filtering of custom fields by object type
-* [#20823](https://github.com/netbox-community/netbox/issues/20823) - Disallow creation of API tokens with an expiration date in the past
-* [#20841](https://github.com/netbox-community/netbox/issues/20841) - Support advanced filtering for available rack types when creating/editing a rack
-
-### Bug Fixes
-
-* [#20134](https://github.com/netbox-community/netbox/issues/20134) - Prevent out-of-band HTMX content swaps in embedded tables
-* [#20432](https://github.com/netbox-community/netbox/issues/20432) - Fix tracing of cables across multiple circuits in parallel
-* [#20465](https://github.com/netbox-community/netbox/issues/20465) - Ensure that scripts are updated immediately when a new file is uploaded
-* [#20638](https://github.com/netbox-community/netbox/issues/20638) - Correct OpenAPI schema for bulk create operations
-* [#20649](https://github.com/netbox-community/netbox/issues/20649) - Enforce view permissions on REST API endpoint for custom scripts
-* [#20740](https://github.com/netbox-community/netbox/issues/20740) - Ensure permissions constraints are enforced when executing custom scripts via the REST API
-* [#20743](https://github.com/netbox-community/netbox/issues/20743) - Pass request context to custom script when triggered by an event rule
-* [#20766](https://github.com/netbox-community/netbox/issues/20766) - Fix inadvertent translations on server error page
-* [#20775](https://github.com/netbox-community/netbox/issues/20775) - Fix `TypeError` exception when bulk renaming unnamed devices
-* [#20822](https://github.com/netbox-community/netbox/issues/20822) - Add missing `auto_sync_enabled` field in bulk edit forms
-* [#20827](https://github.com/netbox-community/netbox/issues/20827) - Fix UI styling issue when toggling between light and dark mode
-* [#20839](https://github.com/netbox-community/netbox/issues/20839) - Fix filtering by object type in UI for custom links and saved filters
-* [#20840](https://github.com/netbox-community/netbox/issues/20840) - Remove extraneous references to airflow for RackType model
-* [#20844](https://github.com/netbox-community/netbox/issues/20844) - Fix object type filter for L2VPN terminations
-* [#20859](https://github.com/netbox-community/netbox/issues/20859) - Prevent dashboard crash due to exception raised by a widget
-* [#20865](https://github.com/netbox-community/netbox/issues/20865) - Enforce proper min/max values for latitude & longitude fields
-
---
-
-## v4.4.6 (2025-11-11)
-
-### Enhancements
-
-* [#14171](https://github.com/netbox-community/netbox/issues/14171) - Support VLAN assignment for device & VM interfaces being bulk imported
-* [#20297](https://github.com/netbox-community/netbox/issues/20297) - Introduce additional coaxial cable types
-
-### Bug Fixes
-
-* [#20378](https://github.com/netbox-community/netbox/issues/20378) - Prevent exception when attempting to delete a data source utilized by a custom script
-* [#20645](https://github.com/netbox-community/netbox/issues/20645) - CSVChoiceField should defer to model field's default value when CSV field is empty
-* [#20647](https://github.com/netbox-community/netbox/issues/20647) - Improve handling of empty strings during bulk imports
-* [#20653](https://github.com/netbox-community/netbox/issues/20653) - Fix filtering of jobs by object type ID
-* [#20660](https://github.com/netbox-community/netbox/issues/20660) - Optimize loading of custom script modules from remote storage
-* [#20670](https://github.com/netbox-community/netbox/issues/20670) - Improve validation of related objects during bulk import
-* [#20688](https://github.com/netbox-community/netbox/issues/20688) - Suppress non-harmful "No active configuration revision found" warning message
-* [#20697](https://github.com/netbox-community/netbox/issues/20697) - Prevent duplication of signals which increment/decrement related object counts
-* [#20699](https://github.com/netbox-community/netbox/issues/20699) - Ensure proper ordering of changelog entries resulting from cascading deletions
-* [#20713](https://github.com/netbox-community/netbox/issues/20713) - Ensure a pre-change snapshot is recorded on virtual chassis members being added/removed
-* [#20721](https://github.com/netbox-community/netbox/issues/20721) - Fix breadcrumb navigation links in UI for background tasks
-* [#20738](https://github.com/netbox-community/netbox/issues/20738) - Deleting a virtual chassis should nullify the `vc_position` of all former members
-* [#20750](https://github.com/netbox-community/netbox/issues/20750) - Fix cloning of permissions when only one action is enabled
-* [#20755](https://github.com/netbox-community/netbox/issues/20755) - Prevent duplicate results under certain conditions when filtering providers
-* [#20771](https://github.com/netbox-community/netbox/issues/20771) - Comments are required when creating a new journal entry
-* [#20774](https://github.com/netbox-community/netbox/issues/20774) - Bulk action button labels should be translated
-
---
-
-## v4.4.5 (2025-10-28)
-
-### Enhancements
-
-* [#19751](https://github.com/netbox-community/netbox/issues/19751) - Disable occupied module bays in form dropdowns when installing a new module
-* [#20301](https://github.com/netbox-community/netbox/issues/20301) - Add a "dismiss all" option to the notifications dropdown
-* [#20399](https://github.com/netbox-community/netbox/issues/20399) - Add `assigned` and `primary` boolean filters for MAC addresses
-* [#20567](https://github.com/netbox-community/netbox/issues/20567) - Add contacts column to services table
-* [#20675](https://github.com/netbox-community/netbox/issues/20675) - Enable [NetBox Copilot](https://netboxlabs.com/products/netbox-copilot/) integration
-* [#20692](https://github.com/netbox-community/netbox/issues/20692) - Add contacts column to IP addresses table
-* [#20700](https://github.com/netbox-community/netbox/issues/20700) - Add contacts table column for various additional models
-
-### Bug Fixes
-
-* [#19872](https://github.com/netbox-community/netbox/issues/19872) - Ensure custom script validation failures display error messages
-* [#20389](https://github.com/netbox-community/netbox/issues/20389) - Fix "select all" behavior for bulk rename views
-* [#20422](https://github.com/netbox-community/netbox/issues/20422) - Enable filtering of aggregates and prefixes by family in GraphQL API
-* [#20459](https://github.com/netbox-community/netbox/issues/20459) - Fix validation of `is_oob` & `is_primary` fields under IP address bulk import
-* [#20466](https://github.com/netbox-community/netbox/issues/20466) - Fix querying of devices with a primary IP assigned in GraphQL API
-* [#20498](https://github.com/netbox-community/netbox/issues/20498) - Enforce the validation regex (if set) for custom URL fields
-* [#20524](https://github.com/netbox-community/netbox/issues/20524) - Raise a validation error when attempting to schedule a custom script for a past date/time
-* [#20541](https://github.com/netbox-community/netbox/issues/20541) - Fix resolution of GraphQL object fields which rely on custom filters
-* [#20551](https://github.com/netbox-community/netbox/issues/20551) - Fix automatic slug generation in quick-add UI form
-* [#20606](https://github.com/netbox-community/netbox/issues/20606) - Enable copying of values from table columns rendered as badges
-* [#20641](https://github.com/netbox-community/netbox/issues/20641) - Fix `AttributeError` exception raised by the object changes REST API endpoint
-* [#20646](https://github.com/netbox-community/netbox/issues/20646) - Prevent cables from connecting to objects marked as connected
-* [#20655](https://github.com/netbox-community/netbox/issues/20655) - Fix `FieldError` exception when attempting to sort permissions list by actions
-
---
-
 ## v4.4.4 (2025-10-15)

 ### Bug Fixes
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,7 +77,6 @@ nav:
        - Wireless: 'features/wireless.md'
        - Virtualization: 'features/virtualization.md'
        - VPN Tunnels: 'features/vpn-tunnels.md'
-        - Resource Ownership: 'features/resource-ownership.md'
        - Tenancy: 'features/tenancy.md'
        - Contacts: 'features/contacts.md'
        - Search: 'features/search.md'
@@ -143,7 +142,6 @@ nav:
            - Getting Started: 'plugins/development/index.md'
            - Models: 'plugins/development/models.md'
            - Views: 'plugins/development/views.md'
-            - UI Components: 'plugins/development/ui-components.md'
            - Navigation: 'plugins/development/navigation.md'
            - Templates: 'plugins/development/templates.md'
            - Tables: 'plugins/development/tables.md'
@@ -275,9 +273,6 @@ nav:
            - ContactRole: 'models/tenancy/contactrole.md'
            - Tenant: 'models/tenancy/tenant.md'
            - TenantGroup: 'models/tenancy/tenantgroup.md'
-        - Users:
-            - Owner: 'models/users/owner.md'
-            - OwnerGroup: 'models/users/ownergroup.md'
        - Virtualization:
            - Cluster: 'models/virtualization/cluster.md'
            - ClusterGroup: 'models/virtualization/clustergroup.md'
--- a/netbox/circuits/api/serializers_/circuits.py
+++ b/netbox/circuits/api/serializers_/circuits.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers

 from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices, VirtualCircuitTerminationRoleChoices
@@ -10,12 +11,10 @@ from circuits.models import (
 from dcim.api.serializers_.device_components import InterfaceSerializer
 from dcim.api.serializers_.cables import CabledObjectSerializer
 from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField
-from netbox.api.gfk_fields import GFKSerializerField
-from netbox.api.serializers import (
-    NetBoxModelSerializer, OrganizationalModelSerializer, PrimaryModelSerializer, WritableNestedSerializer,
-)
+from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
 from netbox.choices import DistanceUnitChoices
 from tenancy.api.serializers_.tenants import TenantSerializer
+from utilities.api import get_serializer_for_model
 from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer

 __all__ = (
@@ -30,7 +29,7 @@ __all__ = (
 )


-class CircuitTypeSerializer(OrganizationalModelSerializer):
+class CircuitTypeSerializer(NetBoxModelSerializer):

    # Related object counts
    circuit_count = RelatedObjectCountField('circuits')
@@ -38,8 +37,8 @@ class CircuitTypeSerializer(OrganizationalModelSerializer):
    class Meta:
        model = CircuitType
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'owner', 'tags',
-            'custom_fields', 'created', 'last_updated', 'circuit_count',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'tags', 'custom_fields',
+            'created', 'last_updated', 'circuit_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'circuit_count')

@@ -54,7 +53,7 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
        default=None
    )
    termination_id = serializers.IntegerField(allow_null=True, required=False, default=None)
-    termination = GFKSerializerField(read_only=True)
+    termination = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = CircuitTermination
@@ -63,16 +62,24 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
            'upstream_speed', 'xconnect_id', 'description',
        ]

+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_termination(self, obj):
+        if obj.termination_id is None:
+            return None
+        serializer = get_serializer_for_model(obj.termination)
+        context = {'request': self.context['request']}
+        return serializer(obj.termination, nested=True, context=context).data

-class CircuitGroupSerializer(OrganizationalModelSerializer):
+
+class CircuitGroupSerializer(NetBoxModelSerializer):
    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
    circuit_count = RelatedObjectCountField('assignments')

    class Meta:
        model = CircuitGroup
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'description', 'tenant', 'owner', 'tags',
-            'custom_fields', 'created', 'last_updated', 'circuit_count'
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'description', 'tenant',
+            'tags', 'custom_fields', 'created', 'last_updated', 'circuit_count'
        ]
        brief_fields = ('id', 'url', 'display', 'name')

@@ -92,7 +99,7 @@ class CircuitGroupAssignmentSerializer_(NetBoxModelSerializer):
        brief_fields = ('id', 'url', 'display', 'group', 'priority')


-class CircuitSerializer(PrimaryModelSerializer):
+class CircuitSerializer(NetBoxModelSerializer):
    provider = ProviderSerializer(nested=True)
    provider_account = ProviderAccountSerializer(nested=True, required=False, allow_null=True, default=None)
    status = ChoiceField(choices=CircuitStatusChoices, required=False)
@@ -108,7 +115,7 @@ class CircuitSerializer(PrimaryModelSerializer):
        fields = [
            'id', 'url', 'display_url', 'display', 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant',
            'install_date', 'termination_date', 'commit_rate', 'description', 'distance', 'distance_unit',
-            'termination_a', 'termination_z', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'termination_a', 'termination_z', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
            'assignments',
        ]
        brief_fields = ('id', 'url', 'display', 'provider', 'cid', 'description')
@@ -125,7 +132,7 @@ class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer
        default=None
    )
    termination_id = serializers.IntegerField(allow_null=True, required=False, default=None)
-    termination = GFKSerializerField(read_only=True)
+    termination = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = CircuitTermination
@@ -137,12 +144,20 @@ class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer
        ]
        brief_fields = ('id', 'url', 'display', 'circuit', 'term_side', 'description', 'cable', '_occupied')

+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_termination(self, obj):
+        if obj.termination_id is None:
+            return None
+        serializer = get_serializer_for_model(obj.termination)
+        context = {'request': self.context['request']}
+        return serializer(obj.termination, nested=True, context=context).data
+

 class CircuitGroupAssignmentSerializer(CircuitGroupAssignmentSerializer_):
    member_type = ContentTypeField(
        queryset=ContentType.objects.filter(CIRCUIT_GROUP_ASSIGNMENT_MEMBER_MODELS)
    )
-    member = GFKSerializerField(read_only=True)
+    member = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = CircuitGroupAssignment
@@ -152,8 +167,16 @@ class CircuitGroupAssignmentSerializer(CircuitGroupAssignmentSerializer_):
        ]
        brief_fields = ('id', 'url', 'display', 'group', 'member_type', 'member_id', 'member', 'priority')

+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_member(self, obj):
+        if obj.member_id is None:
+            return None
+        serializer = get_serializer_for_model(obj.member)
+        context = {'request': self.context['request']}
+        return serializer(obj.member, nested=True, context=context).data

-class VirtualCircuitTypeSerializer(OrganizationalModelSerializer):
+
+class VirtualCircuitTypeSerializer(NetBoxModelSerializer):

    # Related object counts
    virtual_circuit_count = RelatedObjectCountField('virtual_circuits')
@@ -161,13 +184,13 @@ class VirtualCircuitTypeSerializer(OrganizationalModelSerializer):
    class Meta:
        model = VirtualCircuitType
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'owner', 'tags',
-            'custom_fields', 'created', 'last_updated', 'virtual_circuit_count',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'tags', 'custom_fields',
+            'created', 'last_updated', 'virtual_circuit_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'virtual_circuit_count')


-class VirtualCircuitSerializer(PrimaryModelSerializer):
+class VirtualCircuitSerializer(NetBoxModelSerializer):
    provider_network = ProviderNetworkSerializer(nested=True)
    provider_account = ProviderAccountSerializer(nested=True, required=False, allow_null=True, default=None)
    type = VirtualCircuitTypeSerializer(nested=True)
@@ -178,7 +201,7 @@ class VirtualCircuitSerializer(PrimaryModelSerializer):
        model = VirtualCircuit
        fields = [
            'id', 'url', 'display_url', 'display', 'cid', 'provider_network', 'provider_account', 'type', 'status',
-            'tenant', 'description', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'tenant', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'provider_network', 'cid', 'description')

--- a/netbox/circuits/api/serializers_/providers.py
+++ b/netbox/circuits/api/serializers_/providers.py
@@ -4,7 +4,7 @@ from circuits.models import Provider, ProviderAccount, ProviderNetwork
 from ipam.api.serializers_.asns import ASNSerializer
 from ipam.models import ASN
 from netbox.api.fields import RelatedObjectCountField, SerializedPKRelatedField
-from netbox.api.serializers import PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from .nested import NestedProviderAccountSerializer

 __all__ = (
@@ -14,7 +14,7 @@ __all__ = (
 )


-class ProviderSerializer(PrimaryModelSerializer):
+class ProviderSerializer(NetBoxModelSerializer):
    accounts = SerializedPKRelatedField(
        queryset=ProviderAccount.objects.all(),
        serializer=NestedProviderAccountSerializer,
@@ -35,32 +35,32 @@ class ProviderSerializer(PrimaryModelSerializer):
    class Meta:
        model = Provider
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'accounts', 'description', 'owner', 'comments',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'accounts', 'description', 'comments',
            'asns', 'tags', 'custom_fields', 'created', 'last_updated', 'circuit_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'circuit_count')


-class ProviderAccountSerializer(PrimaryModelSerializer):
+class ProviderAccountSerializer(NetBoxModelSerializer):
    provider = ProviderSerializer(nested=True)
    name = serializers.CharField(allow_blank=True, max_length=100, required=False, default='')

    class Meta:
        model = ProviderAccount
        fields = [
-            'id', 'url', 'display_url', 'display', 'provider', 'name', 'account', 'description', 'owner', 'comments',
-            'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'provider', 'name', 'account', 'description', 'comments', 'tags',
+            'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'account', 'description')


-class ProviderNetworkSerializer(PrimaryModelSerializer):
+class ProviderNetworkSerializer(NetBoxModelSerializer):
    provider = ProviderSerializer(nested=True)

    class Meta:
        model = ProviderNetwork
        fields = [
-            'id', 'url', 'display_url', 'display', 'provider', 'name', 'service_id', 'description', 'owner', 'comments',
-            'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'provider', 'name', 'service_id', 'description', 'comments', 'tags',
+            'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description')
--- a/netbox/circuits/filtersets.py
+++ b/netbox/circuits/filtersets.py
@@ -6,7 +6,7 @@ from django.utils.translation import gettext as _
 from dcim.filtersets import CabledObjectFilterSet
 from dcim.models import Interface, Location, Region, Site, SiteGroup
 from ipam.models import ASN
-from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
+from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 from utilities.filters import (
    ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, TreeNodeMultipleChoiceFilter,
@@ -29,7 +29,7 @@ __all__ = (
 )


-class ProviderFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
+class ProviderFilterSet(NetBoxModelFilterSet, ContactModelFilterSet):
    region_id = TreeNodeMultipleChoiceFilter(
        queryset=Region.objects.all(),
        field_name='circuits__terminations___region',
@@ -89,11 +89,13 @@ class ProviderFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
        return queryset.filter(
            Q(name__icontains=value) |
            Q(description__icontains=value) |
+            Q(accounts__account__icontains=value) |
+            Q(accounts__name__icontains=value) |
            Q(comments__icontains=value)
        )


-class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
+class ProviderAccountFilterSet(NetBoxModelFilterSet, ContactModelFilterSet):
    provider_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Provider.objects.all(),
        label=_('Provider (ID)'),
@@ -120,7 +122,7 @@ class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
        ).distinct()


-class ProviderNetworkFilterSet(PrimaryModelFilterSet):
+class ProviderNetworkFilterSet(NetBoxModelFilterSet):
    provider_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Provider.objects.all(),
        label=_('Provider (ID)'),
@@ -154,7 +156,7 @@ class CircuitTypeFilterSet(OrganizationalModelFilterSet):
        fields = ('id', 'name', 'slug', 'color', 'description')


-class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
+class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
    provider_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Provider.objects.all(),
        label=_('Provider (ID)'),
@@ -346,7 +348,7 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
        model = CircuitTermination
        fields = (
            'id', 'termination_id', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'description',
-            'mark_connected', 'pp_info', 'cable_end', 'cable_position',
+            'mark_connected', 'pp_info', 'cable_end',
        )

    def search(self, queryset, name, value):
@@ -473,7 +475,7 @@ class VirtualCircuitTypeFilterSet(OrganizationalModelFilterSet):
        fields = ('id', 'name', 'slug', 'color', 'description')


-class VirtualCircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
+class VirtualCircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
    provider_id = django_filters.ModelMultipleChoiceFilter(
        field_name='provider_network__provider',
        queryset=Provider.objects.all(),
--- a/netbox/circuits/forms/bulk_edit.py
+++ b/netbox/circuits/forms/bulk_edit.py
@@ -11,11 +11,11 @@ from circuits.models import *
 from dcim.models import Site
 from ipam.models import ASN
 from netbox.choices import DistanceUnitChoices
-from netbox.forms import NetBoxModelBulkEditForm, OrganizationalModelBulkEditForm, PrimaryModelBulkEditForm
+from netbox.forms import NetBoxModelBulkEditForm
 from tenancy.models import Tenant
 from utilities.forms import add_blank_choice, get_field_value
 from utilities.forms.fields import (
-    ColorField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
+    ColorField, CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect, NumberWithOptions
@@ -36,12 +36,18 @@ __all__ = (
 )


-class ProviderBulkEditForm(PrimaryModelBulkEditForm):
+class ProviderBulkEditForm(NetBoxModelBulkEditForm):
    asns = DynamicModelMultipleChoiceField(
        queryset=ASN.objects.all(),
        label=_('ASNs'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Provider
    fieldsets = (
@@ -52,12 +58,18 @@ class ProviderBulkEditForm(PrimaryModelBulkEditForm):
    )


-class ProviderAccountBulkEditForm(PrimaryModelBulkEditForm):
+class ProviderAccountBulkEditForm(NetBoxModelBulkEditForm):
    provider = DynamicModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = ProviderAccount
    fieldsets = (
@@ -68,7 +80,7 @@ class ProviderAccountBulkEditForm(PrimaryModelBulkEditForm):
    )


-class ProviderNetworkBulkEditForm(PrimaryModelBulkEditForm):
+class ProviderNetworkBulkEditForm(NetBoxModelBulkEditForm):
    provider = DynamicModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
@@ -79,6 +91,12 @@ class ProviderNetworkBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        label=_('Service ID')
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = ProviderNetwork
    fieldsets = (
@@ -89,11 +107,16 @@ class ProviderNetworkBulkEditForm(PrimaryModelBulkEditForm):
    )


-class CircuitTypeBulkEditForm(OrganizationalModelBulkEditForm):
+class CircuitTypeBulkEditForm(NetBoxModelBulkEditForm):
    color = ColorField(
        label=_('Color'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )

    model = CircuitType
    fieldsets = (
@@ -102,7 +125,7 @@ class CircuitTypeBulkEditForm(OrganizationalModelBulkEditForm):
    nullable_fields = ('color', 'description')


-class CircuitBulkEditForm(PrimaryModelBulkEditForm):
+class CircuitBulkEditForm(NetBoxModelBulkEditForm):
    type = DynamicModelChoiceField(
        label=_('Type'),
        queryset=CircuitType.objects.all(),
@@ -160,6 +183,12 @@ class CircuitBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=100,
+        required=False
+    )
+    comments = CommentField()

    model = Circuit
    fieldsets = (
@@ -232,7 +261,12 @@ class CircuitTerminationBulkEditForm(NetBoxModelBulkEditForm):
                pass


-class CircuitGroupBulkEditForm(OrganizationalModelBulkEditForm):
+class CircuitGroupBulkEditForm(NetBoxModelBulkEditForm):
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
    tenant = DynamicModelChoiceField(
        label=_('Tenant'),
        queryset=Tenant.objects.all(),
@@ -264,11 +298,16 @@ class CircuitGroupAssignmentBulkEditForm(NetBoxModelBulkEditForm):
    nullable_fields = ('priority',)


-class VirtualCircuitTypeBulkEditForm(OrganizationalModelBulkEditForm):
+class VirtualCircuitTypeBulkEditForm(NetBoxModelBulkEditForm):
    color = ColorField(
        label=_('Color'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )

    model = VirtualCircuitType
    fieldsets = (
@@ -277,7 +316,7 @@ class VirtualCircuitTypeBulkEditForm(OrganizationalModelBulkEditForm):
    nullable_fields = ('color', 'description')


-class VirtualCircuitBulkEditForm(PrimaryModelBulkEditForm):
+class VirtualCircuitBulkEditForm(NetBoxModelBulkEditForm):
    provider_network = DynamicModelChoiceField(
        label=_('Provider network'),
        queryset=ProviderNetwork.objects.all(),
@@ -304,6 +343,12 @@ class VirtualCircuitBulkEditForm(PrimaryModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=100,
+        required=False
+    )
+    comments = CommentField()

    model = VirtualCircuit
    fieldsets = (
--- a/netbox/circuits/forms/bulk_import.py
+++ b/netbox/circuits/forms/bulk_import.py
@@ -7,7 +7,7 @@ from circuits.constants import *
 from circuits.models import *
 from dcim.models import Interface
 from netbox.choices import DistanceUnitChoices
-from netbox.forms import NetBoxModelImportForm, OrganizationalModelImportForm, PrimaryModelImportForm
+from netbox.forms import NetBoxModelImportForm
 from tenancy.models import Tenant
 from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField

@@ -28,17 +28,17 @@ __all__ = (
 )


-class ProviderImportForm(PrimaryModelImportForm):
+class ProviderImportForm(NetBoxModelImportForm):
    slug = SlugField()

    class Meta:
        model = Provider
        fields = (
-            'name', 'slug', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'description', 'comments', 'tags',
        )


-class ProviderAccountImportForm(PrimaryModelImportForm):
+class ProviderAccountImportForm(NetBoxModelImportForm):
    provider = CSVModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
@@ -49,11 +49,11 @@ class ProviderAccountImportForm(PrimaryModelImportForm):
    class Meta:
        model = ProviderAccount
        fields = (
-            'provider', 'name', 'account', 'description', 'owner', 'comments', 'tags',
+            'provider', 'name', 'account', 'description', 'comments', 'tags',
        )


-class ProviderNetworkImportForm(PrimaryModelImportForm):
+class ProviderNetworkImportForm(NetBoxModelImportForm):
    provider = CSVModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
@@ -64,19 +64,19 @@ class ProviderNetworkImportForm(PrimaryModelImportForm):
    class Meta:
        model = ProviderNetwork
        fields = [
-            'provider', 'name', 'service_id', 'description', 'owner', 'comments', 'tags'
+            'provider', 'name', 'service_id', 'description', 'comments', 'tags'
        ]


-class CircuitTypeImportForm(OrganizationalModelImportForm):
+class CircuitTypeImportForm(NetBoxModelImportForm):
    slug = SlugField()

    class Meta:
        model = CircuitType
-        fields = ('name', 'slug', 'color', 'description', 'owner', 'tags')
+        fields = ('name', 'slug', 'color', 'description', 'tags')


-class CircuitImportForm(PrimaryModelImportForm):
+class CircuitImportForm(NetBoxModelImportForm):
    provider = CSVModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
@@ -119,7 +119,7 @@ class CircuitImportForm(PrimaryModelImportForm):
        model = Circuit
        fields = [
            'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', 'install_date', 'termination_date',
-            'commit_rate', 'distance', 'distance_unit', 'description', 'owner', 'comments', 'tags'
+            'commit_rate', 'distance', 'distance_unit', 'description', 'comments', 'tags'
        ]


@@ -165,7 +165,7 @@ class CircuitTerminationImportForm(NetBoxModelImportForm, BaseCircuitTermination
        }


-class CircuitGroupImportForm(OrganizationalModelImportForm):
+class CircuitGroupImportForm(NetBoxModelImportForm):
    tenant = CSVModelChoiceField(
        label=_('Tenant'),
        queryset=Tenant.objects.all(),
@@ -176,7 +176,7 @@ class CircuitGroupImportForm(OrganizationalModelImportForm):

    class Meta:
        model = CircuitGroup
-        fields = ('name', 'slug', 'description', 'tenant', 'owner', 'tags')
+        fields = ('name', 'slug', 'description', 'tenant', 'tags')


 class CircuitGroupAssignmentImportForm(NetBoxModelImportForm):
@@ -195,14 +195,15 @@ class CircuitGroupAssignmentImportForm(NetBoxModelImportForm):
        fields = ('member_type', 'member_id', 'group', 'priority')


-class VirtualCircuitTypeImportForm(OrganizationalModelImportForm):
+class VirtualCircuitTypeImportForm(NetBoxModelImportForm):
+    slug = SlugField()

    class Meta:
        model = VirtualCircuitType
-        fields = ('name', 'slug', 'color', 'description', 'owner', 'tags')
+        fields = ('name', 'slug', 'color', 'description', 'tags')


-class VirtualCircuitImportForm(PrimaryModelImportForm):
+class VirtualCircuitImportForm(NetBoxModelImportForm):
    provider_network = CSVModelChoiceField(
        label=_('Provider network'),
        queryset=ProviderNetwork.objects.all(),
@@ -238,8 +239,8 @@ class VirtualCircuitImportForm(PrimaryModelImportForm):
    class Meta:
        model = VirtualCircuit
        fields = [
-            'cid', 'provider_network', 'provider_account', 'type', 'status', 'tenant', 'description', 'owner',
-            'comments', 'tags',
+            'cid', 'provider_network', 'provider_account', 'type', 'status', 'tenant', 'description', 'comments',
+            'tags',
        ]


--- a/netbox/circuits/forms/filtersets.py
+++ b/netbox/circuits/forms/filtersets.py
@@ -9,7 +9,7 @@ from circuits.models import *
 from dcim.models import Location, Region, Site, SiteGroup
 from ipam.models import ASN
 from netbox.choices import DistanceUnitChoices
-from netbox.forms import NetBoxModelFilterSetForm, OrganizationalModelFilterSetForm, PrimaryModelFilterSetForm
+from netbox.forms import NetBoxModelFilterSetForm
 from tenancy.forms import TenancyFilterForm, ContactModelFilterForm
 from utilities.forms import add_blank_choice
 from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
@@ -31,10 +31,10 @@ __all__ = (
 )


-class ProviderFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
+class ProviderFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Provider
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
        FieldSet('asn_id', name=_('ASN')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
@@ -66,10 +66,10 @@ class ProviderFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class ProviderAccountFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
+class ProviderAccountFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = ProviderAccount
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('provider_id', 'account', name=_('Attributes')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
@@ -85,10 +85,10 @@ class ProviderAccountFilterForm(ContactModelFilterForm, PrimaryModelFilterSetFor
    tag = TagFilterField(model)


-class ProviderNetworkFilterForm(PrimaryModelFilterSetForm):
+class ProviderNetworkFilterForm(NetBoxModelFilterSetForm):
    model = ProviderNetwork
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('provider_id', 'service_id', name=_('Attributes')),
    )
    provider_id = DynamicModelMultipleChoiceField(
@@ -104,10 +104,10 @@ class ProviderNetworkFilterForm(PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class CircuitTypeFilterForm(OrganizationalModelFilterSetForm):
+class CircuitTypeFilterForm(NetBoxModelFilterSetForm):
    model = CircuitType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('color', name=_('Attributes')),
    )
    tag = TagFilterField(model)
@@ -118,10 +118,10 @@ class CircuitTypeFilterForm(OrganizationalModelFilterSetForm):
    )


-class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
+class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Circuit
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')),
        FieldSet(
            'type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit',
@@ -271,10 +271,10 @@ class CircuitTerminationFilterForm(NetBoxModelFilterSetForm):
    tag = TagFilterField(model)


-class CircuitGroupFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
+class CircuitGroupFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = CircuitGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
    )
    tag = TagFilterField(model)
@@ -309,10 +309,10 @@ class CircuitGroupAssignmentFilterForm(NetBoxModelFilterSetForm):
    tag = TagFilterField(model)


-class VirtualCircuitTypeFilterForm(OrganizationalModelFilterSetForm):
+class VirtualCircuitTypeFilterForm(NetBoxModelFilterSetForm):
    model = VirtualCircuitType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('color', name=_('Attributes')),
    )
    tag = TagFilterField(model)
@@ -323,10 +323,10 @@ class VirtualCircuitTypeFilterForm(OrganizationalModelFilterSetForm):
    )


-class VirtualCircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
+class VirtualCircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = VirtualCircuit
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')),
        FieldSet('type_id', 'status', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
--- a/netbox/circuits/forms/model_forms.py
+++ b/netbox/circuits/forms/model_forms.py
@@ -10,11 +10,11 @@ from circuits.constants import *
 from circuits.models import *
 from dcim.models import Interface, Site
 from ipam.models import ASN
-from netbox.forms import NetBoxModelForm, OrganizationalModelForm, PrimaryModelForm
+from netbox.forms import NetBoxModelForm
 from tenancy.forms import TenancyForm
 from utilities.forms import get_field_value
 from utilities.forms.fields import (
-    ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField,
+    CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField,
 )
 from utilities.forms.mixins import DistanceValidationMixin
 from utilities.forms.rendering import FieldSet, InlineFields
@@ -36,13 +36,14 @@ __all__ = (
 )


-class ProviderForm(PrimaryModelForm):
+class ProviderForm(NetBoxModelForm):
    slug = SlugField()
    asns = DynamicModelMultipleChoiceField(
        queryset=ASN.objects.all(),
        label=_('ASNs'),
        required=False
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('name', 'slug', 'asns', 'description', 'tags'),
@@ -51,32 +52,34 @@ class ProviderForm(PrimaryModelForm):
    class Meta:
        model = Provider
        fields = [
-            'name', 'slug', 'asns', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'asns', 'description', 'comments', 'tags',
        ]


-class ProviderAccountForm(PrimaryModelForm):
+class ProviderAccountForm(NetBoxModelForm):
    provider = DynamicModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
        selector=True,
        quick_add=True
    )
+    comments = CommentField()

    class Meta:
        model = ProviderAccount
        fields = [
-            'provider', 'name', 'account', 'description', 'owner', 'comments', 'tags',
+            'provider', 'name', 'account', 'description', 'comments', 'tags',
        ]


-class ProviderNetworkForm(PrimaryModelForm):
+class ProviderNetworkForm(NetBoxModelForm):
    provider = DynamicModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
        selector=True,
        quick_add=True
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('provider', 'name', 'service_id', 'description', 'tags'),
@@ -85,13 +88,15 @@ class ProviderNetworkForm(PrimaryModelForm):
    class Meta:
        model = ProviderNetwork
        fields = [
-            'provider', 'name', 'service_id', 'description', 'owner', 'comments', 'tags',
+            'provider', 'name', 'service_id', 'description', 'comments', 'tags',
        ]


-class CircuitTypeForm(OrganizationalModelForm):
+class CircuitTypeForm(NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
-        FieldSet('name', 'slug', 'color', 'description', 'owner', 'tags'),
+        FieldSet('name', 'slug', 'color', 'description', 'tags'),
    )

    class Meta:
@@ -101,7 +106,7 @@ class CircuitTypeForm(OrganizationalModelForm):
        ]


-class CircuitForm(DistanceValidationMixin, TenancyForm, PrimaryModelForm):
+class CircuitForm(DistanceValidationMixin, TenancyForm, NetBoxModelForm):
    provider = DynamicModelChoiceField(
        label=_('Provider'),
        queryset=Provider.objects.all(),
@@ -120,6 +125,7 @@ class CircuitForm(DistanceValidationMixin, TenancyForm, PrimaryModelForm):
        queryset=CircuitType.objects.all(),
        quick_add=True
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -141,7 +147,7 @@ class CircuitForm(DistanceValidationMixin, TenancyForm, PrimaryModelForm):
        model = Circuit
        fields = [
            'cid', 'type', 'provider', 'provider_account', 'status', 'install_date', 'termination_date', 'commit_rate',
-            'distance', 'distance_unit', 'description', 'tenant_group', 'tenant', 'owner', 'comments', 'tags',
+            'distance', 'distance_unit', 'description', 'tenant_group', 'tenant', 'comments', 'tags',
        ]
        widgets = {
            'install_date': DatePicker(),
@@ -227,7 +233,9 @@ class CircuitTerminationForm(NetBoxModelForm):
        self.instance.termination = self.cleaned_data.get('termination')


-class CircuitGroupForm(TenancyForm, OrganizationalModelForm):
+class CircuitGroupForm(TenancyForm, NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
        FieldSet('name', 'slug', 'description', 'tags', name=_('Circuit Group')),
        FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
@@ -236,7 +244,7 @@ class CircuitGroupForm(TenancyForm, OrganizationalModelForm):
    class Meta:
        model = CircuitGroup
        fields = [
-            'name', 'slug', 'description', 'tenant_group', 'tenant', 'owner', 'tags',
+            'name', 'slug', 'description', 'tenant_group', 'tenant', 'tags',
        ]


@@ -299,7 +307,9 @@ class CircuitGroupAssignmentForm(NetBoxModelForm):
        self.instance.member = self.cleaned_data.get('member')


-class VirtualCircuitTypeForm(OrganizationalModelForm):
+class VirtualCircuitTypeForm(NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
        FieldSet('name', 'slug', 'color', 'description', 'tags'),
    )
@@ -307,11 +317,11 @@ class VirtualCircuitTypeForm(OrganizationalModelForm):
    class Meta:
        model = VirtualCircuitType
        fields = [
-            'name', 'slug', 'color', 'description', 'owner', 'tags',
+            'name', 'slug', 'color', 'description', 'tags',
        ]


-class VirtualCircuitForm(TenancyForm, PrimaryModelForm):
+class VirtualCircuitForm(TenancyForm, NetBoxModelForm):
    provider_network = DynamicModelChoiceField(
        label=_('Provider network'),
        queryset=ProviderNetwork.objects.all(),
@@ -326,6 +336,7 @@ class VirtualCircuitForm(TenancyForm, PrimaryModelForm):
        queryset=VirtualCircuitType.objects.all(),
        quick_add=True
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -339,7 +350,7 @@ class VirtualCircuitForm(TenancyForm, PrimaryModelForm):
        model = VirtualCircuit
        fields = [
            'cid', 'provider_network', 'provider_account', 'type', 'status', 'description', 'tenant_group', 'tenant',
-            'owner', 'comments', 'tags',
+            'comments', 'tags',
        ]


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

 from circuits import models
 from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
@@ -52,9 +52,7 @@ class CircuitTerminationFilter(
    circuit: Annotated['CircuitFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    term_side: (
-        BaseFilterLookup[Annotated['CircuitTerminationSideEnum', strawberry.lazy('circuits.graphql.enums')]] | None
-    ) = (
+    term_side: Annotated['CircuitTerminationSideEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    termination_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
@@ -110,7 +108,7 @@ class CircuitFilter(
        strawberry_django.filter_field()
    )
    type_id: ID | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')]] | None = (
+    status: Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    install_date: DateFilterLookup[date] | None = strawberry_django.filter_field()
@@ -145,7 +143,7 @@ class CircuitGroupAssignmentFilter(
        strawberry_django.filter_field()
    )
    group_id: ID | None = strawberry_django.filter_field()
-    priority: BaseFilterLookup[Annotated['CircuitPriorityEnum', strawberry.lazy('circuits.graphql.enums')]] | None = (
+    priority: Annotated['CircuitPriorityEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )

@@ -200,7 +198,7 @@ class VirtualCircuitFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
        strawberry_django.filter_field()
    )
    type_id: ID | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')]] | None = (
+    status: Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    group_assignments: Annotated['CircuitGroupAssignmentFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
@@ -216,11 +214,7 @@ class VirtualCircuitTerminationFilter(
        strawberry_django.filter_field()
    )
    virtual_circuit_id: ID | None = strawberry_django.filter_field()
-    role: (
-        BaseFilterLookup[
-            Annotated['VirtualCircuitTerminationRoleEnum', strawberry.lazy('circuits.graphql.enums')]
-        ] | None
-    ) = (
+    role: Annotated['VirtualCircuitTerminationRoleEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    interface: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
--- a/netbox/circuits/graphql/types.py
+++ b/netbox/circuits/graphql/types.py
@@ -6,7 +6,7 @@ import strawberry_django
 from circuits import models
 from dcim.graphql.mixins import CabledObjectMixin
 from extras.graphql.mixins import ContactsMixin, CustomFieldsMixin, TagsMixin
-from netbox.graphql.types import BaseObjectType, ObjectType, OrganizationalObjectType, PrimaryObjectType
+from netbox.graphql.types import BaseObjectType, NetBoxObjectType, ObjectType, OrganizationalObjectType
 from tenancy.graphql.types import TenantType
 from .filters import *

@@ -35,7 +35,8 @@ __all__ = (
    filters=ProviderFilter,
    pagination=True
 )
-class ProviderType(ContactsMixin, PrimaryObjectType):
+class ProviderType(NetBoxObjectType, ContactsMixin):
+
    networks: List[Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')]]
    circuits: List[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
    asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]]
@@ -48,8 +49,9 @@ class ProviderType(ContactsMixin, PrimaryObjectType):
    filters=ProviderAccountFilter,
    pagination=True
 )
-class ProviderAccountType(ContactsMixin, PrimaryObjectType):
+class ProviderAccountType(ContactsMixin, NetBoxObjectType):
    provider: Annotated["ProviderType", strawberry.lazy('circuits.graphql.types')]
+
    circuits: List[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]


@@ -59,8 +61,9 @@ class ProviderAccountType(ContactsMixin, PrimaryObjectType):
    filters=ProviderNetworkFilter,
    pagination=True
 )
-class ProviderNetworkType(PrimaryObjectType):
+class ProviderNetworkType(NetBoxObjectType):
    provider: Annotated["ProviderType", strawberry.lazy('circuits.graphql.types')]
+
    circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]


@@ -102,13 +105,14 @@ class CircuitTypeType(OrganizationalObjectType):
    filters=CircuitFilter,
    pagination=True
 )
-class CircuitType(PrimaryObjectType, ContactsMixin):
+class CircuitType(NetBoxObjectType, ContactsMixin):
    provider: ProviderType
    provider_account: ProviderAccountType | None
    termination_a: CircuitTerminationType | None
    termination_z: CircuitTerminationType | None
    type: CircuitTypeType
    tenant: TenantType | None
+
    terminations: List[CircuitTerminationType]


@@ -174,11 +178,12 @@ class VirtualCircuitTerminationType(CustomFieldsMixin, TagsMixin, ObjectType):
    filters=VirtualCircuitFilter,
    pagination=True
 )
-class VirtualCircuitType(PrimaryObjectType):
+class VirtualCircuitType(NetBoxObjectType):
    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(
        select_related=["type"]
    )
    tenant: TenantType | None
+
    terminations: List[VirtualCircuitTerminationType]
--- a/netbox/circuits/migrations/0053_ci_collations.py
+++ b/netbox/circuits/migrations/0053_ci_collations.py
@@ -0,0 +1,97 @@
+from django.db import migrations, models
+
+PATTERN_OPS_INDEXES = [
+    'circuits_circuitgroup_name_ec8ac1e5_like',
+    'circuits_circuitgroup_slug_61ca866b_like',
+    'circuits_circuittype_name_8256ea9a_like',
+    'circuits_circuittype_slug_9b4b3cf9_like',
+    'circuits_provider_name_8f2514f5_like',
+    'circuits_provider_slug_c3c0aa10_like',
+    'circuits_virtualcircuittype_name_5184db16_like',
+    'circuits_virtualcircuittype_slug_75d5c661_like',
+]
+
+
+def remove_indexes(apps, schema_editor):
+    for idx in PATTERN_OPS_INDEXES:
+        schema_editor.execute(f'DROP INDEX IF EXISTS {idx}')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('circuits', '0052_extend_circuit_abs_distance_upper_limit'),
+        ('dcim', '0217_ci_collations'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=remove_indexes,
+            reverse_code=migrations.RunPython.noop,
+        ),
+        migrations.AlterField(
+            model_name='circuit',
+            name='cid',
+            field=models.CharField(db_collation='case_insensitive', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='circuitgroup',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='circuitgroup',
+            name='slug',
+            field=models.SlugField(db_collation='case_insensitive', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='circuittype',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='circuittype',
+            name='slug',
+            field=models.SlugField(db_collation='case_insensitive', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='provider',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='provider',
+            name='slug',
+            field=models.SlugField(db_collation='case_insensitive', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='provideraccount',
+            name='account',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='provideraccount',
+            name='name',
+            field=models.CharField(blank=True, db_collation='ci_natural_sort', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='providernetwork',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='virtualcircuit',
+            name='cid',
+            field=models.CharField(db_collation='case_insensitive', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='virtualcircuittype',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='virtualcircuittype',
+            name='slug',
+            field=models.SlugField(db_collation='case_insensitive', max_length=100, unique=True),
+        ),
+    ]
--- a/netbox/circuits/migrations/0053_owner.py
+++ b/netbox/circuits/migrations/0053_owner.py
@@ -1,68 +0,0 @@
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('circuits', '0052_extend_circuit_abs_distance_upper_limit'),
-        ('users', '0015_owner'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='circuit',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='circuitgroup',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='circuittype',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='provider',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='provideraccount',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='providernetwork',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='virtualcircuit',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-        migrations.AddField(
-            model_name='virtualcircuittype',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-    ]
--- a/netbox/circuits/migrations/0054_cable_position.py
+++ b/netbox/circuits/migrations/0054_cable_position.py
@@ -1,23 +0,0 @@
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('circuits', '0053_owner'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='circuittermination',
-            name='cable_position',
-            field=models.PositiveIntegerField(
-                blank=True,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(1),
-                    django.core.validators.MaxValueValidator(1024),
-                ],
-            ),
-        ),
-    ]
--- a/netbox/circuits/models/circuits.py
+++ b/netbox/circuits/models/circuits.py
@@ -41,9 +41,10 @@ class Circuit(ContactsMixin, ImageAttachmentsMixin, DistanceMixin, PrimaryModel)
    ProviderAccount. Circuit port speed and commit rate are measured in Kbps.
    """
    cid = models.CharField(
-        max_length=100,
        verbose_name=_('circuit ID'),
-        help_text=_('Unique circuit ID')
+        max_length=100,
+        db_collation='case_insensitive',
+        help_text=_('Unique circuit ID'),
    )
    provider = models.ForeignKey(
        to='circuits.Provider',
--- a/netbox/circuits/models/providers.py
+++ b/netbox/circuits/models/providers.py
@@ -21,13 +21,14 @@ class Provider(ContactsMixin, PrimaryModel):
        verbose_name=_('name'),
        max_length=100,
        unique=True,
+        db_collation='ci_natural_sort',
        help_text=_('Full name of the provider'),
-        db_collation="natural_sort"
    )
    slug = models.SlugField(
        verbose_name=_('slug'),
        max_length=100,
-        unique=True
+        unique=True,
+        db_collation='case_insensitive',
    )
    asns = models.ManyToManyField(
        to='ipam.ASN',
@@ -56,13 +57,15 @@ class ProviderAccount(ContactsMixin, PrimaryModel):
        related_name='accounts'
    )
    account = models.CharField(
+        verbose_name=_('account ID'),
        max_length=100,
-        verbose_name=_('account ID')
+        db_collation='ci_natural_sort',
    )
    name = models.CharField(
        verbose_name=_('name'),
        max_length=100,
-        blank=True
+        db_collation='ci_natural_sort',
+        blank=True,
    )

    clone_fields = ('provider', )
@@ -97,7 +100,7 @@ class ProviderNetwork(PrimaryModel):
    name = models.CharField(
        verbose_name=_('name'),
        max_length=100,
-        db_collation="natural_sort"
+        db_collation='ci_natural_sort',
    )
    provider = models.ForeignKey(
        to='circuits.Provider',
--- a/netbox/circuits/models/virtual_circuits.py
+++ b/netbox/circuits/models/virtual_circuits.py
@@ -34,9 +34,10 @@ class VirtualCircuit(PrimaryModel):
    A virtual connection between two or more endpoints, delivered across one or more physical circuits.
    """
    cid = models.CharField(
-        max_length=100,
        verbose_name=_('circuit ID'),
-        help_text=_('Unique circuit ID')
+        max_length=100,
+        db_collation='case_insensitive',
+        help_text=_('Unique circuit ID'),
    )
    provider_network = models.ForeignKey(
        to='circuits.ProviderNetwork',
--- a/netbox/circuits/tables/circuits.py
+++ b/netbox/circuits/tables/circuits.py
@@ -1,9 +1,11 @@
-import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
+import django_tables2 as tables

 from circuits.models import *
-from netbox.tables import NetBoxTable, OrganizationalModelTable, PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
+
+from netbox.tables import NetBoxTable, columns
+
 from .columns import CommitRateColumn

 __all__ = (
@@ -22,7 +24,7 @@ CIRCUITTERMINATION_LINK = """
 """


-class CircuitTypeTable(OrganizationalModelTable):
+class CircuitTypeTable(NetBoxTable):
    name = tables.Column(
        linkify=True,
        verbose_name=_('Name'),
@@ -37,7 +39,7 @@ class CircuitTypeTable(OrganizationalModelTable):
        verbose_name=_('Circuits')
    )

-    class Meta(OrganizationalModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = CircuitType
        fields = (
            'pk', 'id', 'name', 'circuit_count', 'color', 'description', 'slug', 'tags', 'created', 'last_updated',
@@ -46,7 +48,7 @@ class CircuitTypeTable(OrganizationalModelTable):
        default_columns = ('pk', 'name', 'circuit_count', 'color', 'description')


-class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
+class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
    cid = tables.Column(
        linkify=True,
        verbose_name=_('Circuit ID')
@@ -77,6 +79,9 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
        verbose_name=_('Commit Rate')
    )
    distance = columns.DistanceColumn()
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments')
+    )
    tags = columns.TagColumn(
        url_name='circuits:circuit_list'
    )
@@ -85,7 +90,7 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
        linkify_item=True
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = Circuit
        fields = (
            'pk', 'id', 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', 'tenant_group',
@@ -158,7 +163,7 @@ class CircuitTerminationTable(NetBoxTable):
        )


-class CircuitGroupTable(OrganizationalModelTable):
+class CircuitGroupTable(NetBoxTable):
    name = tables.Column(
        verbose_name=_('Name'),
        linkify=True
@@ -172,7 +177,7 @@ class CircuitGroupTable(OrganizationalModelTable):
        url_name='circuits:circuitgroup_list'
    )

-    class Meta(OrganizationalModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = CircuitGroup
        fields = (
            'pk', 'name', 'description', 'circuit_group_assignment_count', 'tags',
--- a/netbox/circuits/tables/providers.py
+++ b/netbox/circuits/tables/providers.py
@@ -1,11 +1,11 @@
 import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
-from django_tables2.utils import Accessor
-
 from circuits.models import *
-from netbox.tables import PrimaryModelTable, columns
+from django_tables2.utils import Accessor
 from tenancy.tables import ContactsColumnMixin

+from netbox.tables import NetBoxTable, columns
+
 __all__ = (
    'ProviderTable',
    'ProviderAccountTable',
@@ -13,7 +13,7 @@ __all__ = (
 )


-class ProviderTable(ContactsColumnMixin, PrimaryModelTable):
+class ProviderTable(ContactsColumnMixin, NetBoxTable):
    name = tables.Column(
        verbose_name=_('Name'),
        linkify=True
@@ -42,11 +42,14 @@ class ProviderTable(ContactsColumnMixin, PrimaryModelTable):
        url_params={'provider_id': 'pk'},
        verbose_name=_('Circuits')
    )
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments'),
+    )
    tags = columns.TagColumn(
        url_name='circuits:provider_list'
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = Provider
        fields = (
            'pk', 'id', 'name', 'accounts', 'account_count', 'asns', 'asn_count', 'circuit_count', 'description',
@@ -55,7 +58,7 @@ class ProviderTable(ContactsColumnMixin, PrimaryModelTable):
        default_columns = ('pk', 'name', 'account_count', 'circuit_count')


-class ProviderAccountTable(ContactsColumnMixin, PrimaryModelTable):
+class ProviderAccountTable(ContactsColumnMixin, NetBoxTable):
    account = tables.Column(
        linkify=True,
        verbose_name=_('Account'),
@@ -73,11 +76,14 @@ class ProviderAccountTable(ContactsColumnMixin, PrimaryModelTable):
        url_params={'provider_account_id': 'pk'},
        verbose_name=_('Circuits')
    )
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments'),
+    )
    tags = columns.TagColumn(
        url_name='circuits:provideraccount_list'
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = ProviderAccount
        fields = (
            'pk', 'id', 'account', 'name', 'provider', 'circuit_count', 'comments', 'contacts', 'tags', 'created',
@@ -86,7 +92,7 @@ class ProviderAccountTable(ContactsColumnMixin, PrimaryModelTable):
        default_columns = ('pk', 'account', 'name', 'provider', 'circuit_count')


-class ProviderNetworkTable(PrimaryModelTable):
+class ProviderNetworkTable(NetBoxTable):
    name = tables.Column(
        verbose_name=_('Name'),
        linkify=True
@@ -95,11 +101,14 @@ class ProviderNetworkTable(PrimaryModelTable):
        verbose_name=_('Provider'),
        linkify=True
    )
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments'),
+    )
    tags = columns.TagColumn(
        url_name='circuits:providernetwork_list'
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = ProviderNetwork
        fields = (
            'pk', 'id', 'name', 'provider', 'service_id', 'description', 'comments', 'created', 'last_updated', 'tags',
--- a/netbox/circuits/tables/virtual_circuits.py
+++ b/netbox/circuits/tables/virtual_circuits.py
@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _

 from circuits.models import *
-from netbox.tables import NetBoxTable, OrganizationalModelTable, PrimaryModelTable, columns
+from netbox.tables import NetBoxTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin

 __all__ = (
@@ -12,7 +12,7 @@ __all__ = (
 )


-class VirtualCircuitTypeTable(OrganizationalModelTable):
+class VirtualCircuitTypeTable(NetBoxTable):
    name = tables.Column(
        linkify=True,
        verbose_name=_('Name'),
@@ -27,7 +27,7 @@ class VirtualCircuitTypeTable(OrganizationalModelTable):
        verbose_name=_('Circuits')
    )

-    class Meta(OrganizationalModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = VirtualCircuitType
        fields = (
            'pk', 'id', 'name', 'virtual_circuit_count', 'color', 'description', 'slug', 'tags', 'created',
@@ -36,7 +36,7 @@ class VirtualCircuitTypeTable(OrganizationalModelTable):
        default_columns = ('pk', 'name', 'virtual_circuit_count', 'color', 'description')


-class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
+class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
    cid = tables.Column(
        linkify=True,
        verbose_name=_('Circuit ID')
@@ -63,11 +63,14 @@ class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModel
        url_params={'virtual_circuit_id': 'pk'},
        verbose_name=_('Terminations')
    )
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments')
+    )
    tags = columns.TagColumn(
        url_name='circuits:virtualcircuit_list'
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = VirtualCircuit
        fields = (
            'pk', 'id', 'cid', 'provider', 'provider_account', 'provider_network', 'type', 'status', 'tenant',
--- a/netbox/circuits/urls.py
+++ b/netbox/circuits/urls.py
@@ -18,6 +18,11 @@ urlpatterns = [
    path('circuit-types/<int:pk>/', include(get_model_urls('circuits', 'circuittype'))),

    path('circuits/', include(get_model_urls('circuits', 'circuit', detail=False))),
+    path(
+        'circuits/<int:pk>/terminations/swap/',
+        views.CircuitSwapTerminations.as_view(),
+        name='circuit_terminations_swap'
+    ),
    path('circuits/<int:pk>/', include(get_model_urls('circuits', 'circuit'))),

    path('circuit-terminations/', include(get_model_urls('circuits', 'circuittermination', detail=False))),
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -1,8 +1,13 @@
+from django.contrib import messages
+from django.db import router, transaction
+from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.translation import gettext_lazy as _

 from dcim.views import PathTraceView
 from ipam.models import ASN
 from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport
 from netbox.views import generic
+from utilities.forms import ConfirmationForm
 from utilities.query import count_related
 from utilities.views import GetRelatedModelsMixin, register_model_view
 from . import filtersets, forms, tables
@@ -78,7 +83,6 @@ class ProviderBulkEditView(generic.BulkEditView):
@register_model_view(Provider, 'bulk_rename', path='rename', detail=False)
 class ProviderBulkRenameView(generic.BulkRenameView):
    queryset = Provider.objects.all()
-    filterset = filtersets.ProviderFilterSet


@register_model_view(Provider, 'bulk_delete', path='delete', detail=False)
@@ -146,7 +150,6 @@ class ProviderAccountBulkEditView(generic.BulkEditView):
@register_model_view(ProviderAccount, 'bulk_rename', path='rename', detail=False)
 class ProviderAccountBulkRenameView(generic.BulkRenameView):
    queryset = ProviderAccount.objects.all()
-    filterset = filtersets.ProviderAccountFilterSet


@register_model_view(ProviderAccount, 'bulk_delete', path='delete', detail=False)
@@ -223,7 +226,6 @@ class ProviderNetworkBulkEditView(generic.BulkEditView):
@register_model_view(ProviderNetwork, 'bulk_rename', path='rename', detail=False)
 class ProviderNetworkBulkRenameView(generic.BulkRenameView):
    queryset = ProviderNetwork.objects.all()
-    filterset = filtersets.ProviderNetworkFilterSet


@register_model_view(ProviderNetwork, 'bulk_delete', path='delete', detail=False)
@@ -288,7 +290,6 @@ class CircuitTypeBulkEditView(generic.BulkEditView):
@register_model_view(CircuitType, 'bulk_rename', path='rename', detail=False)
 class CircuitTypeBulkRenameView(generic.BulkRenameView):
    queryset = CircuitType.objects.all()
-    filterset = filtersets.CircuitTypeFilterSet


@register_model_view(CircuitType, 'bulk_delete', path='delete', detail=False)
@@ -361,7 +362,6 @@ class CircuitBulkEditView(generic.BulkEditView):
 class CircuitBulkRenameView(generic.BulkRenameView):
    queryset = Circuit.objects.all()
    field_name = 'cid'
-    filterset = filtersets.CircuitFilterSet


@register_model_view(Circuit, 'bulk_delete', path='delete', detail=False)
@@ -373,6 +373,82 @@ class CircuitBulkDeleteView(generic.BulkDeleteView):
    table = tables.CircuitTable


+class CircuitSwapTerminations(generic.ObjectEditView):
+    """
+    Swap the A and Z terminations of a circuit.
+    """
+    queryset = Circuit.objects.all()
+
+    def get(self, request, pk):
+        circuit = get_object_or_404(self.queryset, pk=pk)
+        form = ConfirmationForm()
+
+        # Circuit must have at least one termination to swap
+        if not circuit.termination_a and not circuit.termination_z:
+            messages.error(request, _(
+                "No terminations have been defined for circuit {circuit}."
+            ).format(circuit=circuit))
+            return redirect('circuits:circuit', pk=circuit.pk)
+
+        return render(request, 'circuits/circuit_terminations_swap.html', {
+            'circuit': circuit,
+            'termination_a': circuit.termination_a,
+            'termination_z': circuit.termination_z,
+            'form': form,
+            'panel_class': 'light',
+            'button_class': 'primary',
+            'return_url': circuit.get_absolute_url(),
+        })
+
+    def post(self, request, pk):
+        circuit = get_object_or_404(self.queryset, pk=pk)
+        form = ConfirmationForm(request.POST)
+
+        if form.is_valid():
+
+            termination_a = CircuitTermination.objects.filter(pk=circuit.termination_a_id).first()
+            termination_z = CircuitTermination.objects.filter(pk=circuit.termination_z_id).first()
+
+            if termination_a and termination_z:
+                # Use a placeholder to avoid an IntegrityError on the (circuit, term_side) unique constraint
+                with transaction.atomic(using=router.db_for_write(CircuitTermination)):
+                    termination_a.term_side = '_'
+                    termination_a.save()
+                    termination_z.term_side = 'A'
+                    termination_z.save()
+                    termination_a.term_side = 'Z'
+                    termination_a.save()
+                    circuit.refresh_from_db()
+                    circuit.termination_a = termination_z
+                    circuit.termination_z = termination_a
+                    circuit.save()
+            elif termination_a:
+                termination_a.term_side = 'Z'
+                termination_a.save()
+                circuit.refresh_from_db()
+                circuit.termination_a = None
+                circuit.save()
+            else:
+                termination_z.term_side = 'A'
+                termination_z.save()
+                circuit.refresh_from_db()
+                circuit.termination_z = None
+                circuit.save()
+
+            messages.success(request, _("Swapped terminations for circuit {circuit}.").format(circuit=circuit))
+            return redirect('circuits:circuit', pk=circuit.pk)
+
+        return render(request, 'circuits/circuit_terminations_swap.html', {
+            'circuit': circuit,
+            'termination_a': circuit.termination_a,
+            'termination_z': circuit.termination_z,
+            'form': form,
+            'panel_class': 'default',
+            'button_class': 'primary',
+            'return_url': circuit.get_absolute_url(),
+        })
+
+
 #
 # Circuit terminations
 #
@@ -481,7 +557,6 @@ class CircuitGroupBulkEditView(generic.BulkEditView):
@register_model_view(CircuitGroup, 'bulk_rename', path='rename', detail=False)
 class CircuitGroupBulkRenameView(generic.BulkRenameView):
    queryset = CircuitGroup.objects.all()
-    filterset = filtersets.CircuitGroupFilterSet


@register_model_view(CircuitGroup, 'bulk_delete', path='delete', detail=False)
@@ -597,7 +672,6 @@ class VirtualCircuitTypeBulkEditView(generic.BulkEditView):
@register_model_view(VirtualCircuitType, 'bulk_rename', path='rename', detail=False)
 class VirtualCircuitTypeBulkRenameView(generic.BulkRenameView):
    queryset = VirtualCircuitType.objects.all()
-    filterset = filtersets.VirtualCircuitTypeFilterSet


@register_model_view(VirtualCircuitType, 'bulk_delete', path='delete', detail=False)
@@ -670,7 +744,6 @@ class VirtualCircuitBulkEditView(generic.BulkEditView):
 class VirtualCircuitBulkRenameView(generic.BulkRenameView):
    queryset = VirtualCircuit.objects.all()
    field_name = 'cid'
-    filterset = filtersets.VirtualCircuitFilterSet


@register_model_view(VirtualCircuit, 'bulk_delete', path='delete', detail=False)
--- a/netbox/core/api/schema.py
+++ b/netbox/core/api/schema.py
@@ -12,7 +12,6 @@ from drf_spectacular.utils import Direction

 from netbox.api.fields import ChoiceField
 from netbox.api.serializers import WritableNestedSerializer
-from netbox.api.viewsets import NetBoxModelViewSet

 # see netbox.api.routers.NetBoxRouter
 BULK_ACTIONS = ("bulk_destroy", "bulk_partial_update", "bulk_update")
@@ -50,11 +49,6 @@ class ChoiceFieldFix(OpenApiSerializerFieldExtension):
            )


-def viewset_handles_bulk_create(view):
-    """Check if view automatically provides list-based bulk create"""
-    return isinstance(view, NetBoxModelViewSet)
-
-
 class NetBoxAutoSchema(AutoSchema):
    """
    Overrides to drf_spectacular.openapi.AutoSchema to fix following issues:
@@ -134,36 +128,6 @@ class NetBoxAutoSchema(AutoSchema):

        return response_serializers

-    def _get_request_for_media_type(self, serializer, direction='request'):
-        """
-        Override to generate oneOf schema for serializers that support both
-        single object and array input (NetBoxModelViewSet POST operations).
-
-        Refs: #20638
-        """
-        # Get the standard schema first
-        schema, required = super()._get_request_for_media_type(serializer, direction)
-
-        # If this serializer supports arrays (marked in get_request_serializer),
-        # wrap the schema in oneOf to allow single object OR array
-        if (
-            direction == 'request' and
-            schema is not None and
-            getattr(self.view, 'action', None) == 'create' and
-            viewset_handles_bulk_create(self.view)
-        ):
-            return {
-                'oneOf': [
-                    schema,  # Single object
-                    {
-                        'type': 'array',
-                        'items': schema,  # Array of objects
-                    }
-                ]
-            }, required
-
-        return schema, required
-
    def _get_serializer_name(self, serializer, direction, bypass_extensions=False) -> str:
        name = super()._get_serializer_name(serializer, direction, bypass_extensions)

--- a/netbox/core/api/serializers_/change_logging.py
+++ b/netbox/core/api/serializers_/change_logging.py
@@ -1,11 +1,13 @@
+from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers

 from core.choices import *
 from core.models import ObjectChange
+from netbox.api.exceptions import SerializerNotFound
 from netbox.api.fields import ChoiceField, ContentTypeField
-from netbox.api.gfk_fields import GFKSerializerField
 from netbox.api.serializers import BaseModelSerializer
 from users.api.serializers_.users import UserSerializer
+from utilities.api import get_serializer_for_model

 __all__ = (
    'ObjectChangeSerializer',
@@ -24,10 +26,7 @@ class ObjectChangeSerializer(BaseModelSerializer):
    changed_object_type = ContentTypeField(
        read_only=True
    )
-    changed_object = GFKSerializerField(
-        read_only=True
-    )
-    object_repr = serializers.CharField(
+    changed_object = serializers.SerializerMethodField(
        read_only=True
    )
    prechange_data = serializers.JSONField(
@@ -45,6 +44,22 @@ class ObjectChangeSerializer(BaseModelSerializer):
        model = ObjectChange
        fields = [
            'id', 'url', 'display_url', 'display', 'time', 'user', 'user_name', 'request_id', 'action',
-            'changed_object_type', 'changed_object_id', 'changed_object', 'object_repr', 'message',
-            'prechange_data', 'postchange_data',
+            'changed_object_type', 'changed_object_id', 'changed_object', 'message', 'prechange_data',
+            'postchange_data',
        ]
+
+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_changed_object(self, obj):
+        """
+        Serialize a nested representation of the changed object.
+        """
+        if obj.changed_object is None:
+            return None
+
+        try:
+            serializer = get_serializer_for_model(obj.changed_object)
+        except SerializerNotFound:
+            return obj.object_repr
+        data = serializer(obj.changed_object, nested=True, context={'request': self.context['request']}).data
+
+        return data
--- a/netbox/core/api/serializers_/data.py
+++ b/netbox/core/api/serializers_/data.py
@@ -1,7 +1,7 @@
 from core.choices import *
 from core.models import DataFile, DataSource
 from netbox.api.fields import ChoiceField, RelatedObjectCountField
-from netbox.api.serializers import NetBoxModelSerializer, PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from netbox.utils import get_data_backend_choices

 __all__ = (
@@ -10,7 +10,7 @@ __all__ = (
 )


-class DataSourceSerializer(PrimaryModelSerializer):
+class DataSourceSerializer(NetBoxModelSerializer):
    type = ChoiceField(
        choices=get_data_backend_choices()
    )
@@ -26,8 +26,8 @@ class DataSourceSerializer(PrimaryModelSerializer):
        model = DataSource
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'type', 'source_url', 'enabled', 'status', 'description',
-            'sync_interval', 'parameters', 'ignore_rules', 'owner', 'comments', 'custom_fields', 'created',
-            'last_updated', 'last_synced', 'file_count',
+            'sync_interval', 'parameters', 'ignore_rules', 'comments', 'custom_fields', 'created', 'last_updated',
+            'last_synced', 'file_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description')

--- a/netbox/core/api/serializers_/jobs.py
+++ b/netbox/core/api/serializers_/jobs.py
@@ -1,13 +1,8 @@
-from drf_spectacular.utils import extend_schema_field
-from rest_framework import serializers
-
 from core.choices import *
 from core.models import Job
-from netbox.api.exceptions import SerializerNotFound
 from netbox.api.fields import ChoiceField, ContentTypeField
 from netbox.api.serializers import BaseModelSerializer
 from users.api.serializers_.users import UserSerializer
-from utilities.api import get_serializer_for_model

 __all__ = (
    'JobSerializer',
@@ -23,28 +18,11 @@ class JobSerializer(BaseModelSerializer):
    object_type = ContentTypeField(
        read_only=True
    )
-    object = serializers.SerializerMethodField(
-        read_only=True
-    )

    class Meta:
        model = Job
        fields = [
-            'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'object', 'name', 'status', 'created',
-            'scheduled', 'interval', 'started', 'completed', 'user', 'data', 'error', 'job_id', 'log_entries',
+            'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'name', 'status', 'created', 'scheduled',
+            'interval', 'started', 'completed', 'user', 'data', 'error', 'job_id', 'log_entries',
        ]
        brief_fields = ('url', 'created', 'completed', 'user', 'status')
-
-    @extend_schema_field(serializers.JSONField(allow_null=True))
-    def get_object(self, obj):
-        """
-        Serialize a nested representation of the object.
-        """
-        if obj.object is None:
-            return None
-        try:
-            serializer = get_serializer_for_model(obj.object)
-        except SerializerNotFound:
-            return obj.object_repr
-        context = {'request': self.context['request']}
-        return serializer(obj.object, nested=True, context=context).data
--- a/netbox/core/filtersets.py
+++ b/netbox/core/filtersets.py
@@ -3,7 +3,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from django.utils.translation import gettext as _

-from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, PrimaryModelFilterSet
+from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, NetBoxModelFilterSet
 from netbox.utils import get_data_backend_choices
 from users.models import User
 from utilities.filters import ContentTypeFilter
@@ -20,7 +20,7 @@ __all__ = (
 )


-class DataSourceFilterSet(PrimaryModelFilterSet):
+class DataSourceFilterSet(NetBoxModelFilterSet):
    type = django_filters.MultipleChoiceFilter(
        choices=get_data_backend_choices,
        null_value=None
@@ -80,10 +80,6 @@ class JobFilterSet(BaseFilterSet):
        method='search',
        label=_('Search'),
    )
-    object_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ObjectType.objects.with_feature('jobs'),
-        field_name='object_type_id',
-    )
    object_type = ContentTypeFilter()
    created = django_filters.DateTimeFilter()
    created__before = django_filters.DateTimeFilter(
@@ -128,7 +124,7 @@ class JobFilterSet(BaseFilterSet):

    class Meta:
        model = Job
-        fields = ('id', 'object_type', 'object_type_id', 'object_id', 'name', 'interval', 'status', 'user', 'job_id')
+        fields = ('id', 'object_type', 'object_id', 'name', 'interval', 'status', 'user', 'job_id')

    def search(self, queryset, name, value):
        if not value.strip():
--- a/netbox/core/forms/bulk_edit.py
+++ b/netbox/core/forms/bulk_edit.py
@@ -3,8 +3,9 @@ from django.utils.translation import gettext_lazy as _

 from core.choices import JobIntervalChoices
 from core.models import *
-from netbox.forms import PrimaryModelBulkEditForm
+from netbox.forms import NetBoxModelBulkEditForm
 from netbox.utils import get_data_backend_choices
+from utilities.forms.fields import CommentField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import BulkEditNullBooleanSelect

@@ -13,7 +14,7 @@ __all__ = (
 )


-class DataSourceBulkEditForm(PrimaryModelBulkEditForm):
+class DataSourceBulkEditForm(NetBoxModelBulkEditForm):
    type = forms.ChoiceField(
        label=_('Type'),
        choices=get_data_backend_choices,
@@ -24,11 +25,17 @@ class DataSourceBulkEditForm(PrimaryModelBulkEditForm):
        widget=BulkEditNullBooleanSelect(),
        label=_('Enabled')
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
    sync_interval = forms.ChoiceField(
        choices=JobIntervalChoices,
        required=False,
        label=_('Sync interval')
    )
+    comments = CommentField()
    parameters = forms.JSONField(
        label=_('Parameters'),
        required=False
--- a/netbox/core/forms/bulk_import.py
+++ b/netbox/core/forms/bulk_import.py
@@ -1,16 +1,16 @@
 from core.models import *
-from netbox.forms import PrimaryModelImportForm
+from netbox.forms import NetBoxModelImportForm

 __all__ = (
    'DataSourceImportForm',
 )


-class DataSourceImportForm(PrimaryModelImportForm):
+class DataSourceImportForm(NetBoxModelImportForm):

    class Meta:
        model = DataSource
        fields = (
            'name', 'type', 'source_url', 'enabled', 'description', 'sync_interval', 'parameters', 'ignore_rules',
-            'owner', 'comments',
+            'comments',
        )
--- a/netbox/core/forms/filtersets.py
+++ b/netbox/core/forms/filtersets.py
@@ -3,13 +3,13 @@ from django.utils.translation import gettext_lazy as _

 from core.choices import *
 from core.models import *
-from netbox.forms import NetBoxModelFilterSetForm, PrimaryModelFilterSetForm
+from netbox.forms import NetBoxModelFilterSetForm
 from netbox.forms.mixins import SavedFiltersMixin
 from netbox.utils import get_data_backend_choices
 from users.models import User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
 from utilities.forms.fields import (
-    ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField,
+    ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import DateTimePicker
@@ -23,10 +23,10 @@ __all__ = (
 )


-class DataSourceFilterForm(PrimaryModelFilterSetForm):
+class DataSourceFilterForm(NetBoxModelFilterSetForm):
    model = DataSource
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id'),
        FieldSet('type', 'status', 'enabled', 'sync_interval', name=_('Data Source')),
    )
    type = forms.MultipleChoiceField(
@@ -51,7 +51,6 @@ class DataSourceFilterForm(PrimaryModelFilterSetForm):
        choices=JobIntervalChoices,
        required=False
    )
-    tag = TagFilterField(model)


 class DataFileFilterForm(NetBoxModelFilterSetForm):
@@ -71,13 +70,13 @@ class JobFilterForm(SavedFiltersMixin, FilterForm):
    model = Job
    fieldsets = (
        FieldSet('q', 'filter_id'),
-        FieldSet('object_type_id', 'status', name=_('Attributes')),
+        FieldSet('object_type', 'status', name=_('Attributes')),
        FieldSet(
            'created__before', 'created__after', 'scheduled__before', 'scheduled__after', 'started__before',
            'started__after', 'completed__before', 'completed__after', 'user', name=_('Creation')
        ),
    )
-    object_type_id = ContentTypeChoiceField(
+    object_type = ContentTypeChoiceField(
        label=_('Object Type'),
        queryset=ObjectType.objects.with_feature('jobs'),
        required=False,
--- a/netbox/core/forms/model_forms.py
+++ b/netbox/core/forms/model_forms.py
@@ -9,11 +9,11 @@ from django.utils.translation import gettext_lazy as _
 from core.forms.mixins import SyncedDataMixin
 from core.models import *
 from netbox.config import get_config, PARAMS
-from netbox.forms import NetBoxModelForm, PrimaryModelForm
+from netbox.forms import NetBoxModelForm
 from netbox.registry import registry
 from netbox.utils import get_data_backend_choices
 from utilities.forms import get_field_value
-from utilities.forms.fields import JSONField
+from utilities.forms.fields import CommentField, JSONField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import HTMXSelect

@@ -26,17 +26,17 @@ __all__ = (
 EMPTY_VALUES = ('', None, [], ())


-class DataSourceForm(PrimaryModelForm):
+class DataSourceForm(NetBoxModelForm):
    type = forms.ChoiceField(
        choices=get_data_backend_choices,
        widget=HTMXSelect()
    )
+    comments = CommentField()

    class Meta:
        model = DataSource
        fields = [
-            'name', 'type', 'source_url', 'enabled', 'description', 'sync_interval', 'ignore_rules', 'owner',
-            'comments', 'tags',
+            'name', 'type', 'source_url', 'enabled', 'description', 'sync_interval', 'ignore_rules', 'comments', 'tags',
        ]
        widgets = {
            'ignore_rules': forms.Textarea(
@@ -166,8 +166,8 @@ class ConfigRevisionForm(forms.ModelForm, metaclass=ConfigFormMetaclass):
        FieldSet('CUSTOM_VALIDATORS', 'PROTECTION_RULES', name=_('Validation')),
        FieldSet('DEFAULT_USER_PREFERENCES', name=_('User Preferences')),
        FieldSet(
-            'MAINTENANCE_MODE', 'COPILOT_ENABLED', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION',
-            'MAPS_URL', name=_('Miscellaneous'),
+            'MAINTENANCE_MODE', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION', 'MAPS_URL',
+            name=_('Miscellaneous')
        ),
        FieldSet('comment', name=_('Config Revision'))
    )
--- a/netbox/core/graphql/enums.py
+++ b/netbox/core/graphql/enums.py
@@ -1,11 +0,0 @@
-import strawberry
-
-from core.choices import *
-
-__all__ = (
-    'DataSourceStatusEnum',
-    'ObjectChangeActionEnum',
-)
-
-DataSourceStatusEnum = strawberry.enum(DataSourceStatusChoices.as_enum(prefix='status'))
-ObjectChangeActionEnum = strawberry.enum(ObjectChangeActionChoices.as_enum(prefix='action'))
--- a/netbox/core/graphql/filter_mixins.py
+++ b/netbox/core/graphql/filter_mixins.py
@@ -5,7 +5,7 @@ from typing import Annotated, TYPE_CHECKING
 import strawberry
 import strawberry_django
 from strawberry import ID
-from strawberry_django import FilterLookup, DatetimeFilterLookup
+from strawberry_django import DatetimeFilterLookup

 if TYPE_CHECKING:
    from .filters import *
@@ -23,13 +23,12 @@ class BaseFilterMixin: ...

@dataclass
 class BaseObjectTypeFilterMixin(BaseFilterMixin):
-    id: FilterLookup[ID] | None = strawberry_django.filter_field()
+    id: ID | None = strawberry.UNSET


@dataclass
 class ChangeLogFilterMixin(BaseFilterMixin):
-    id: FilterLookup[ID] | None = strawberry_django.filter_field()
-    # TODO: "changelog" is not a valid field name; needs to be updated for ObjectChange
+    id: ID | None = strawberry.UNSET
    changelog: Annotated['ObjectChangeFilter', strawberry.lazy('core.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
--- a/netbox/core/graphql/filters.py
+++ b/netbox/core/graphql/filters.py
@@ -5,12 +5,11 @@ 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 DatetimeFilterLookup, FilterLookup

 from core import models
 from core.graphql.filter_mixins import BaseFilterMixin
 from netbox.graphql.filter_mixins import PrimaryModelFilterMixin
-from .enums import *

 if TYPE_CHECKING:
    from netbox.graphql.filter_lookups import IntegerLookup, JSONFilter
@@ -26,7 +25,7 @@ __all__ = (

@strawberry_django.filter_type(models.DataFile, lookups=True)
 class DataFileFilter(BaseFilterMixin):
-    id: FilterLookup[ID] | None = strawberry_django.filter_field()
+    id: ID | None = strawberry_django.filter_field()
    created: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
    last_updated: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
    source: Annotated['DataSourceFilter', strawberry.lazy('core.graphql.filters')] | None = (
@@ -45,9 +44,7 @@ class DataSourceFilter(PrimaryModelFilterMixin):
    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()
-    status: (
-        BaseFilterLookup[Annotated['DataSourceStatusEnum', strawberry.lazy('core.graphql.enums')]] | None
-    ) = strawberry_django.filter_field()
+    status: FilterLookup[str] | None = strawberry_django.filter_field()
    enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
    ignore_rules: FilterLookup[str] | None = strawberry_django.filter_field()
    parameters: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -61,14 +58,12 @@ class DataSourceFilter(PrimaryModelFilterMixin):

@strawberry_django.filter_type(models.ObjectChange, lookups=True)
 class ObjectChangeFilter(BaseFilterMixin):
-    id: FilterLookup[ID] | None = strawberry_django.filter_field()
+    id: ID | None = strawberry_django.filter_field()
    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()
-    action: (
-        BaseFilterLookup[Annotated['ObjectChangeActionEnum', strawberry.lazy('core.graphql.enums')]] | None
-    ) = strawberry_django.filter_field()
+    action: FilterLookup[str] | None = strawberry_django.filter_field()
    changed_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -89,6 +84,6 @@ class ObjectChangeFilter(BaseFilterMixin):

@strawberry_django.filter_type(DjangoContentType, lookups=True)
 class ContentTypeFilter(BaseFilterMixin):
-    id: FilterLookup[ID] | None = strawberry_django.filter_field()
+    id: ID | None = strawberry_django.filter_field()
    app_label: FilterLookup[str] | None = strawberry_django.filter_field()
    model: FilterLookup[str] | None = strawberry_django.filter_field()
--- a/netbox/core/graphql/types.py
+++ b/netbox/core/graphql/types.py
@@ -5,7 +5,7 @@ import strawberry_django
 from django.contrib.contenttypes.models import ContentType as DjangoContentType

 from core import models
-from netbox.graphql.types import BaseObjectType, PrimaryObjectType
+from netbox.graphql.types import BaseObjectType, NetBoxObjectType
 from .filters import *

 __all__ = (
@@ -32,7 +32,8 @@ class DataFileType(BaseObjectType):
    filters=DataSourceFilter,
    pagination=True
 )
-class DataSourceType(PrimaryObjectType):
+class DataSourceType(NetBoxObjectType):
+
    datafiles: List[Annotated["DataFileType", strawberry.lazy('core.graphql.types')]]


--- a/netbox/core/migrations/0020_ci_collations.py
+++ b/netbox/core/migrations/0020_ci_collations.py
@@ -0,0 +1,30 @@
+from django.db import migrations, models
+
+PATTERN_OPS_INDEXES = [
+    'core_datasource_name_17788499_like',
+]
+
+
+def remove_indexes(apps, schema_editor):
+    for idx in PATTERN_OPS_INDEXES:
+        schema_editor.execute(f'DROP INDEX IF EXISTS {idx}')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0019_configrevision_active'),
+        ('dcim', '0217_ci_collations'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=remove_indexes,
+            reverse_code=migrations.RunPython.noop,
+        ),
+        migrations.AlterField(
+            model_name='datasource',
+            name='name',
+            field=models.CharField(db_collation='ci_natural_sort', max_length=100, unique=True),
+        ),
+    ]
--- a/netbox/core/migrations/0020_owner.py
+++ b/netbox/core/migrations/0020_owner.py
@@ -1,19 +0,0 @@
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('core', '0019_configrevision_active'),
-        ('users', '0015_owner'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='datasource',
-            name='owner',
-            field=models.ForeignKey(
-                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner'
-            ),
-        ),
-    ]
--- a/netbox/core/models/data.py
+++ b/netbox/core/models/data.py
@@ -38,7 +38,8 @@ class DataSource(JobsMixin, PrimaryModel):
    name = models.CharField(
        verbose_name=_('name'),
        max_length=100,
-        unique=True
+        unique=True,
+        db_collation='ci_natural_sort',
    )
    type = models.CharField(
        verbose_name=_('type'),
--- a/netbox/core/models/files.py
+++ b/netbox/core/models/files.py
@@ -6,6 +6,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.core.files.storage import storages
+from django.urls import reverse
 from django.utils.translation import gettext as _

 from ..choices import ManagedFileRootPathChoices
@@ -63,6 +64,9 @@ class ManagedFile(SyncedDataMixin, models.Model):
    def __str__(self):
        return self.name

+    def get_absolute_url(self):
+        return reverse('core:managedfile', args=[self.pk])
+
    @property
    def name(self):
        return self.file_path
--- a/netbox/core/object_actions.py
+++ b/netbox/core/object_actions.py
@@ -1,4 +1,4 @@
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _

 from netbox.object_actions import ObjectAction

--- a/netbox/core/signals.py
+++ b/netbox/core/signals.py
@@ -3,7 +3,6 @@ from threading import local

 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.db.models import CASCADE
 from django.db.models.fields.reverse_related import ManyToManyRel, ManyToOneRel
 from django.db.models.signals import m2m_changed, post_migrate, post_save, pre_delete
 from django.dispatch import receiver, Signal
@@ -221,8 +220,14 @@ def handle_deleted_object(sender, instance, **kwargs):
            obj.snapshot()  # Ensure the change record includes the "before" state
            if type(relation) is ManyToManyRel:
                getattr(obj, related_field_name).remove(instance)
-            elif type(relation) is ManyToOneRel and relation.null and relation.on_delete is not CASCADE:
+            elif type(relation) is ManyToOneRel and relation.field.null is True:
                setattr(obj, related_field_name, None)
+                # make sure the object hasn't been deleted - in case of
+                # deletion chaining of related objects
+                try:
+                    obj.refresh_from_db()
+                except DoesNotExist:
+                    continue
                obj.save()

    # Enqueue the object for event processing
--- a/netbox/core/tables/data.py
+++ b/netbox/core/tables/data.py
@@ -2,7 +2,7 @@ from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables

 from core.models import *
-from netbox.tables import NetBoxTable, PrimaryModelTable, columns
+from netbox.tables import NetBoxTable, columns
 from .columns import BackendTypeColumn
 from .template_code import DATA_SOURCE_SYNC_BUTTON

@@ -12,7 +12,7 @@ __all__ = (
 )


-class DataSourceTable(PrimaryModelTable):
+class DataSourceTable(NetBoxTable):
    name = tables.Column(
        verbose_name=_('Name'),
        linkify=True,
@@ -42,7 +42,7 @@ class DataSourceTable(PrimaryModelTable):
        extra_buttons=DATA_SOURCE_SYNC_BUTTON,
    )

-    class Meta(PrimaryModelTable.Meta):
+    class Meta(NetBoxTable.Meta):
        model = DataSource
        fields = (
            'pk', 'id', 'name', 'type', 'status', 'enabled', 'source_url', 'description', 'sync_interval', 'comments',
--- a/netbox/core/tests/test_changelog.py
+++ b/netbox/core/tests/test_changelog.py
@@ -5,16 +5,14 @@ from rest_framework import status

 from core.choices import ObjectChangeActionChoices
 from core.models import ObjectChange, ObjectType
-from dcim.choices import InterfaceTypeChoices, ModuleStatusChoices, SiteStatusChoices
-from dcim.models import (
-    Cable, CableTermination, Device, DeviceRole, DeviceType, Manufacturer, Module, ModuleBay, ModuleType, Interface,
-    Site,
-)
+from dcim.choices import SiteStatusChoices
+from dcim.models import Site, CableTermination, Device, DeviceType, DeviceRole, Interface, Cable
 from extras.choices import *
 from extras.models import CustomField, CustomFieldChoiceSet, Tag
 from utilities.testing import APITestCase
-from utilities.testing.utils import create_tags, create_test_device, post_data
+from utilities.testing.utils import create_tags, post_data
 from utilities.testing.views import ModelViewTestCase
+from dcim.models import Manufacturer


 class ChangeLogViewTest(ModelViewTestCase):
@@ -624,64 +622,3 @@ class ChangeLogAPITest(APITestCase):
        self.assertEqual(objectchange.prechange_data['name'], 'Site 1')
        self.assertEqual(objectchange.prechange_data['slug'], 'site-1')
        self.assertEqual(objectchange.postchange_data, None)
-
-    def test_deletion_ordering(self):
-        """
-        Check that the cascading deletion of dependent objects is recorded in the correct order.
-        """
-        device = create_test_device('device1')
-        module_bay = ModuleBay.objects.create(device=device, name='Module Bay 1')
-        module_type = ModuleType.objects.create(manufacturer=Manufacturer.objects.first(), model='Module Type 1')
-        self.add_permissions('dcim.add_module', 'dcim.add_interface', 'dcim.delete_module')
-        self.assertEqual(ObjectChange.objects.count(), 0)  # Sanity check
-
-        # Create a new Module
-        data = {
-            'device': device.pk,
-            'module_bay': module_bay.pk,
-            'module_type': module_type.pk,
-            'status': ModuleStatusChoices.STATUS_ACTIVE,
-        }
-        url = reverse('dcim-api:module-list')
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        module = device.modules.first()
-
-        # Create an Interface on the Module
-        data = {
-            'device': device.pk,
-            'module': module.pk,
-            'name': 'Interface 1',
-            'type': InterfaceTypeChoices.TYPE_1GE_FIXED,
-        }
-        url = reverse('dcim-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        interface = device.interfaces.first()
-
-        # Delete the Module
-        url = reverse('dcim-api:module-detail', kwargs={'pk': module.pk})
-        response = self.client.delete(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(Module.objects.count(), 0)
-        self.assertEqual(Interface.objects.count(), 0)
-
-        # Verify the creation of the expected ObjectChange records. We should see four total records, in this order:
-        #  1. Module created
-        #  2. Interface created
-        #  3. Interface deleted
-        #  4. Module deleted
-        changes = ObjectChange.objects.order_by('time')
-        self.assertEqual(len(changes), 4)
-        self.assertEqual(changes[0].changed_object_type, ContentType.objects.get_for_model(Module))
-        self.assertEqual(changes[0].changed_object_id, module.pk)
-        self.assertEqual(changes[0].action, ObjectChangeActionChoices.ACTION_CREATE)
-        self.assertEqual(changes[1].changed_object_type, ContentType.objects.get_for_model(Interface))
-        self.assertEqual(changes[1].changed_object_id, interface.pk)
-        self.assertEqual(changes[1].action, ObjectChangeActionChoices.ACTION_CREATE)
-        self.assertEqual(changes[2].changed_object_type, ContentType.objects.get_for_model(Interface))
-        self.assertEqual(changes[2].changed_object_id, interface.pk)
-        self.assertEqual(changes[2].action, ObjectChangeActionChoices.ACTION_DELETE)
-        self.assertEqual(changes[3].changed_object_type, ContentType.objects.get_for_model(Module))
-        self.assertEqual(changes[3].changed_object_id, module.pk)
-        self.assertEqual(changes[3].action, ObjectChangeActionChoices.ACTION_DELETE)
--- a/netbox/core/tests/test_openapi_schema.py
+++ b/netbox/core/tests/test_openapi_schema.py
@@ -1,108 +0,0 @@
-"""
-Unit tests for OpenAPI schema generation.
-
-Refs: #20638
-"""
-import json
-from django.test import TestCase
-
-
-class OpenAPISchemaTestCase(TestCase):
-    """Tests for OpenAPI schema generation."""
-
-    def setUp(self):
-        """Fetch schema via API endpoint."""
-        response = self.client.get('/api/schema/', {'format': 'json'})
-        self.assertEqual(response.status_code, 200)
-        self.schema = json.loads(response.content)
-
-    def test_post_operation_documents_single_or_array(self):
-        """
-        POST operations on NetBoxModelViewSet endpoints should document
-        support for both single objects and arrays via oneOf.
-
-        Refs: #20638
-        """
-        # Test representative endpoints across different apps
-        test_paths = [
-            '/api/core/data-sources/',
-            '/api/dcim/sites/',
-            '/api/users/users/',
-            '/api/ipam/ip-addresses/',
-        ]
-
-        for path in test_paths:
-            with self.subTest(path=path):
-                operation = self.schema['paths'][path]['post']
-
-                # Get the request body schema
-                request_schema = operation['requestBody']['content']['application/json']['schema']
-
-                # Should have oneOf with two options
-                self.assertIn('oneOf', request_schema, f"POST {path} should have oneOf schema")
-                self.assertEqual(
-                    len(request_schema['oneOf']), 2,
-                    f"POST {path} oneOf should have exactly 2 options"
-                )
-
-                # First option: single object (has $ref or properties)
-                single_schema = request_schema['oneOf'][0]
-                self.assertTrue(
-                    '$ref' in single_schema or 'properties' in single_schema,
-                    f"POST {path} first oneOf option should be single object"
-                )
-
-                # Second option: array of objects
-                array_schema = request_schema['oneOf'][1]
-                self.assertEqual(
-                    array_schema['type'], 'array',
-                    f"POST {path} second oneOf option should be array"
-                )
-                self.assertIn('items', array_schema, f"POST {path} array should have items")
-
-    def test_bulk_update_operations_require_array_only(self):
-        """
-        Bulk update/patch operations should require arrays only, not oneOf.
-        They don't support single object input.
-
-        Refs: #20638
-        """
-        test_paths = [
-            '/api/dcim/sites/',
-            '/api/users/users/',
-        ]
-
-        for path in test_paths:
-            for method in ['put', 'patch']:
-                with self.subTest(path=path, method=method):
-                    operation = self.schema['paths'][path][method]
-                    request_schema = operation['requestBody']['content']['application/json']['schema']
-
-                    # Should be array-only, not oneOf
-                    self.assertNotIn(
-                        'oneOf', request_schema,
-                        f"{method.upper()} {path} should NOT have oneOf (array-only)"
-                    )
-                    self.assertEqual(
-                        request_schema['type'], 'array',
-                        f"{method.upper()} {path} should require array"
-                    )
-                    self.assertIn(
-                        'items', request_schema,
-                        f"{method.upper()} {path} array should have items"
-                    )
-
-    def test_bulk_delete_requires_array(self):
-        """
-        Bulk delete operations should require arrays.
-
-        Refs: #20638
-        """
-        path = '/api/dcim/sites/'
-        operation = self.schema['paths'][path]['delete']
-        request_schema = operation['requestBody']['content']['application/json']['schema']
-
-        # Should be array-only
-        self.assertNotIn('oneOf', request_schema, "DELETE should NOT have oneOf")
-        self.assertEqual(request_schema['type'], 'array', "DELETE should require array")
-        self.assertIn('items', request_schema, "DELETE array should have items")
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -125,7 +125,6 @@ class DataSourceBulkEditView(generic.BulkEditView):
@register_model_view(DataSource, 'bulk_rename', path='rename', detail=False)
 class DataSourceBulkRenameView(generic.BulkRenameView):
    queryset = DataSource.objects.all()
-    filterset = filtersets.DataSourceFilterSet


@register_model_view(DataSource, 'bulk_delete', path='delete', detail=False)
--- a/netbox/dcim/api/serializers_/base.py
+++ b/netbox/dcim/api/serializers_/base.py
@@ -2,12 +2,10 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers

-from dcim.models import FrontPort, FrontPortTemplate, PortMapping, PortTemplateMapping, RearPort, RearPortTemplate
 from utilities.api import get_serializer_for_model

 __all__ = (
    'ConnectedEndpointsSerializer',
-    'PortSerializer',
 )


@@ -37,53 +35,3 @@ class ConnectedEndpointsSerializer(serializers.ModelSerializer):
    @extend_schema_field(serializers.BooleanField)
    def get_connected_endpoints_reachable(self, obj):
        return obj._path and obj._path.is_complete and obj._path.is_active
-
-
-class PortSerializer(serializers.ModelSerializer):
-    """
-    Base serializer for front & rear port and port templates.
-    """
-    @property
-    def _mapper(self):
-        """
-        Return the model and ForeignKey field name used to track port mappings for this model.
-        """
-        if self.Meta.model is FrontPort:
-            return PortMapping, 'front_port'
-        if self.Meta.model is RearPort:
-            return PortMapping, 'rear_port'
-        if self.Meta.model is FrontPortTemplate:
-            return PortTemplateMapping, 'front_port'
-        if self.Meta.model is RearPortTemplate:
-            return PortTemplateMapping, 'rear_port'
-        raise ValueError(f"Could not determine mapping details for {self.__class__}")
-
-    def create(self, validated_data):
-        mappings = validated_data.pop('mappings', [])
-        instance = super().create(validated_data)
-
-        # Create port mappings
-        mapping_model, fk_name = self._mapper
-        for attrs in mappings:
-            mapping_model.objects.create(**{
-                fk_name: instance,
-                **attrs,
-            })
-
-        return instance
-
-    def update(self, instance, validated_data):
-        mappings = validated_data.pop('mappings', None)
-        instance = super().update(instance, validated_data)
-
-        if mappings is not None:
-            # Update port mappings
-            mapping_model, fk_name = self._mapper
-            mapping_model.objects.filter(**{fk_name: instance}).delete()
-            for attrs in mappings:
-                mapping_model.objects.create(**{
-                    fk_name: instance,
-                    **attrs,
-                })
-
-        return instance
--- a/netbox/dcim/api/serializers_/cables.py
+++ b/netbox/dcim/api/serializers_/cables.py
@@ -5,10 +5,7 @@ from rest_framework import serializers
 from dcim.choices import *
 from dcim.models import Cable, CablePath, CableTermination
 from netbox.api.fields import ChoiceField, ContentTypeField
-from netbox.api.gfk_fields import GFKSerializerField
-from netbox.api.serializers import (
-    BaseModelSerializer, GenericObjectSerializer, NetBoxModelSerializer, PrimaryModelSerializer,
-)
+from netbox.api.serializers import BaseModelSerializer, GenericObjectSerializer, NetBoxModelSerializer
 from tenancy.api.serializers_.tenants import TenantSerializer
 from utilities.api import get_serializer_for_model

@@ -21,20 +18,19 @@ __all__ = (
 )


-class CableSerializer(PrimaryModelSerializer):
+class CableSerializer(NetBoxModelSerializer):
    a_terminations = GenericObjectSerializer(many=True, required=False)
    b_terminations = GenericObjectSerializer(many=True, required=False)
    status = ChoiceField(choices=LinkStatusChoices, required=False)
-    profile = ChoiceField(choices=CableProfileChoices, required=False)
    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
    length_unit = ChoiceField(choices=CableLengthUnitChoices, allow_blank=True, required=False, allow_null=True)

    class Meta:
        model = Cable
        fields = [
-            'id', 'url', 'display_url', 'display', 'type', 'a_terminations', 'b_terminations', 'status', 'profile',
-            'tenant', 'label', 'color', 'length', 'length_unit', 'description', 'owner', 'comments', 'tags',
-            'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'type', 'a_terminations', 'b_terminations', 'status', 'tenant',
+            'label', 'color', 'length', 'length_unit', 'description', 'comments', 'tags', 'custom_fields', 'created',
+            'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'label', 'description')

@@ -55,18 +51,24 @@ class CableTerminationSerializer(NetBoxModelSerializer):
    termination_type = ContentTypeField(
        read_only=True,
    )
-    termination = GFKSerializerField(read_only=True)
+    termination = serializers.SerializerMethodField(
+        read_only=True,
+    )

    class Meta:
        model = CableTermination
        fields = [
            'id', 'url', 'display', 'cable', 'cable_end', 'termination_type', 'termination_id',
-            'termination', 'position', 'created', 'last_updated',
+            'termination', 'created', 'last_updated',
        ]
        read_only_fields = fields
-        brief_fields = (
-            'id', 'url', 'display', 'cable', 'cable_end', 'position', 'termination_type', 'termination_id',
-        )
+        brief_fields = ('id', 'url', 'display', 'cable', 'cable_end', 'termination_type', 'termination_id')
+
+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_termination(self, obj):
+        serializer = get_serializer_for_model(obj.termination)
+        context = {'request': self.context['request']}
+        return serializer(obj.termination, nested=True, context=context).data


 class CablePathSerializer(serializers.ModelSerializer):
--- a/netbox/dcim/api/serializers_/device_components.py
+++ b/netbox/dcim/api/serializers_/device_components.py
@@ -1,25 +1,26 @@
 from django.utils.translation import gettext as _
 from django.contrib.contenttypes.models import ContentType
+from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers

 from dcim.choices import *
 from dcim.constants import *
 from dcim.models import (
-    ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem, ModuleBay, PortMapping,
-    PowerOutlet, PowerPort, RearPort, VirtualDeviceContext,
+    ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem, ModuleBay, PowerOutlet, PowerPort,
+    RearPort, VirtualDeviceContext,
 )
 from ipam.api.serializers_.vlans import VLANSerializer, VLANTranslationPolicySerializer
 from ipam.api.serializers_.vrfs import VRFSerializer
 from ipam.models import VLAN
 from netbox.api.fields import ChoiceField, ContentTypeField, SerializedPKRelatedField
-from netbox.api.gfk_fields import GFKSerializerField
-from netbox.api.serializers import NetBoxModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
+from utilities.api import get_serializer_for_model
 from vpn.api.serializers_.l2vpn import L2VPNTerminationSerializer
 from wireless.api.serializers_.nested import NestedWirelessLinkSerializer
 from wireless.api.serializers_.wirelesslans import WirelessLANSerializer
 from wireless.choices import *
 from wireless.models import WirelessLAN
-from .base import ConnectedEndpointsSerializer, PortSerializer
+from .base import ConnectedEndpointsSerializer
 from .cables import CabledObjectSerializer
 from .devices import DeviceSerializer, MACAddressSerializer, ModuleSerializer, VirtualDeviceContextSerializer
 from .manufacturers import ManufacturerSerializer
@@ -294,20 +295,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect
        return super().validate(data)


-class RearPortMappingSerializer(serializers.ModelSerializer):
-    position = serializers.IntegerField(
-        source='rear_port_position'
-    )
-    front_port = serializers.PrimaryKeyRelatedField(
-        queryset=FrontPort.objects.all(),
-    )
-
-    class Meta:
-        model = PortMapping
-        fields = ('position', 'front_port', 'front_port_position')
-
-
-class RearPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, PortSerializer):
+class RearPortSerializer(NetBoxModelSerializer, CabledObjectSerializer):
    device = DeviceSerializer(nested=True)
    module = ModuleSerializer(
        nested=True,
@@ -316,36 +304,28 @@ class RearPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, PortSeri
        allow_null=True
    )
    type = ChoiceField(choices=PortTypeChoices)
-    front_ports = RearPortMappingSerializer(
-        source='mappings',
-        many=True,
-        required=False,
-    )

    class Meta:
        model = RearPort
        fields = [
            'id', 'url', 'display_url', 'display', 'device', 'module', 'name', 'label', 'type', 'color', 'positions',
-            'front_ports', 'description', 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type',
-            'tags', 'custom_fields', 'created', 'last_updated', '_occupied',
+            'description', 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'tags',
+            'custom_fields', 'created', 'last_updated', '_occupied',
        ]
        brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied')


-class FrontPortMappingSerializer(serializers.ModelSerializer):
-    position = serializers.IntegerField(
-        source='front_port_position'
-    )
-    rear_port = serializers.PrimaryKeyRelatedField(
-        queryset=RearPort.objects.all(),
-    )
+class FrontPortRearPortSerializer(WritableNestedSerializer):
+    """
+    NestedRearPortSerializer but with parent device omitted (since front and rear ports must belong to same device)
+    """

    class Meta:
-        model = PortMapping
-        fields = ('position', 'rear_port', 'rear_port_position')
+        model = RearPort
+        fields = ['id', 'url', 'display_url', 'display', 'name', 'label', 'description']


-class FrontPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, PortSerializer):
+class FrontPortSerializer(NetBoxModelSerializer, CabledObjectSerializer):
    device = DeviceSerializer(nested=True)
    module = ModuleSerializer(
        nested=True,
@@ -354,18 +334,14 @@ class FrontPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, PortSer
        allow_null=True
    )
    type = ChoiceField(choices=PortTypeChoices)
-    rear_ports = FrontPortMappingSerializer(
-        source='mappings',
-        many=True,
-        required=False,
-    )
+    rear_port = FrontPortRearPortSerializer()

    class Meta:
        model = FrontPort
        fields = [
-            'id', 'url', 'display_url', 'display', 'device', 'module', 'name', 'label', 'type', 'color', 'positions',
-            'rear_ports', 'description', 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type',
-            'tags', 'custom_fields', 'created', 'last_updated', '_occupied',
+            'id', 'url', 'display_url', 'display', 'device', 'module', 'name', 'label', 'type', 'color', 'rear_port',
+            'rear_port_position', 'description', 'mark_connected', 'cable', 'cable_end', 'link_peers',
+            'link_peers_type', 'tags', 'custom_fields', 'created', 'last_updated', '_occupied',
        ]
        brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied')

@@ -418,7 +394,7 @@ class InventoryItemSerializer(NetBoxModelSerializer):
        required=False,
        allow_null=True
    )
-    component = GFKSerializerField(read_only=True)
+    component = serializers.SerializerMethodField(read_only=True, allow_null=True)
    _depth = serializers.IntegerField(source='level', read_only=True)
    status = ChoiceField(choices=InventoryItemStatusChoices, required=False)

@@ -430,3 +406,11 @@ class InventoryItemSerializer(NetBoxModelSerializer):
            'component_id', 'component', 'tags', 'custom_fields', 'created', 'last_updated', '_depth',
        ]
        brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', '_depth')
+
+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_component(self, obj):
+        if obj.component is None:
+            return None
+        serializer = get_serializer_for_model(obj.component)
+        context = {'request': self.context['request']}
+        return serializer(obj.component, nested=True, context=context).data
--- a/netbox/dcim/api/serializers_/devices.py
+++ b/netbox/dcim/api/serializers_/devices.py
@@ -11,15 +11,15 @@ from dcim.models import Device, DeviceBay, MACAddress, Module, VirtualDeviceCont
 from extras.api.serializers_.configtemplates import ConfigTemplateSerializer
 from ipam.api.serializers_.ip import IPAddressSerializer
 from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField
-from netbox.api.gfk_fields import GFKSerializerField
-from netbox.api.serializers import PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from tenancy.api.serializers_.tenants import TenantSerializer
+from utilities.api import get_serializer_for_model
 from virtualization.api.serializers_.clusters import ClusterSerializer
 from .devicetypes import *
-from .nested import NestedDeviceBaySerializer, NestedDeviceSerializer, NestedModuleBaySerializer
 from .platforms import PlatformSerializer
 from .racks import RackSerializer
 from .roles import DeviceRoleSerializer
+from .nested import NestedDeviceBaySerializer, NestedDeviceSerializer, NestedModuleBaySerializer
 from .sites import LocationSerializer, SiteSerializer
 from .virtualchassis import VirtualChassisSerializer

@@ -32,7 +32,7 @@ __all__ = (
 )


-class DeviceSerializer(PrimaryModelSerializer):
+class DeviceSerializer(NetBoxModelSerializer):
    device_type = DeviceTypeSerializer(nested=True)
    role = DeviceRoleSerializer(nested=True)
    tenant = TenantSerializer(
@@ -84,8 +84,8 @@ class DeviceSerializer(PrimaryModelSerializer):
            'id', 'url', 'display_url', 'display', 'name', 'device_type', 'role', 'tenant', 'platform', 'serial',
            'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'latitude', 'longitude', 'parent_device',
            'status', 'airflow', 'primary_ip', 'primary_ip4', 'primary_ip6', 'oob_ip', 'cluster', 'virtual_chassis',
-            'vc_position', 'vc_priority', 'description', 'owner', 'comments', 'config_template', 'local_context_data',
-            'tags', 'custom_fields', 'created', 'last_updated', 'console_port_count', 'console_server_port_count',
+            'vc_position', 'vc_priority', 'description', 'comments', 'config_template', 'local_context_data', 'tags',
+            'custom_fields', 'created', 'last_updated', 'console_port_count', 'console_server_port_count',
            'power_port_count', 'power_outlet_count', 'interface_count', 'front_port_count', 'rear_port_count',
            'device_bay_count', 'module_bay_count', 'inventory_item_count',
        ]
@@ -122,7 +122,7 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
        return obj.get_config_context()


-class VirtualDeviceContextSerializer(PrimaryModelSerializer):
+class VirtualDeviceContextSerializer(NetBoxModelSerializer):
    device = DeviceSerializer(nested=True)
    identifier = serializers.IntegerField(allow_null=True, max_value=32767, min_value=0, required=False, default=None)
    tenant = TenantSerializer(nested=True, required=False, allow_null=True, default=None)
@@ -138,13 +138,13 @@ class VirtualDeviceContextSerializer(PrimaryModelSerializer):
        model = VirtualDeviceContext
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'device', 'identifier', 'tenant', 'primary_ip',
-            'primary_ip4', 'primary_ip6', 'status', 'description', 'owner', 'comments', 'tags', 'custom_fields',
+            'primary_ip4', 'primary_ip6', 'status', 'description', 'comments', 'tags', 'custom_fields',
            'created', 'last_updated', 'interface_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'identifier', 'device', 'description')


-class ModuleSerializer(PrimaryModelSerializer):
+class ModuleSerializer(NetBoxModelSerializer):
    device = DeviceSerializer(nested=True)
    module_bay = NestedModuleBaySerializer()
    module_type = ModuleTypeSerializer(nested=True)
@@ -154,23 +154,31 @@ class ModuleSerializer(PrimaryModelSerializer):
        model = Module
        fields = [
            'id', 'url', 'display_url', 'display', 'device', 'module_bay', 'module_type', 'status', 'serial',
-            'asset_tag', 'description', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'asset_tag', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'device', 'module_bay', 'module_type', 'description')


-class MACAddressSerializer(PrimaryModelSerializer):
+class MACAddressSerializer(NetBoxModelSerializer):
    assigned_object_type = ContentTypeField(
        queryset=ContentType.objects.filter(MACADDRESS_ASSIGNMENT_MODELS),
        required=False,
        allow_null=True
    )
-    assigned_object = GFKSerializerField(read_only=True)
+    assigned_object = serializers.SerializerMethodField(read_only=True)

    class Meta:
        model = MACAddress
        fields = [
            'id', 'url', 'display_url', 'display', 'mac_address', 'assigned_object_type', 'assigned_object_id',
-            'assigned_object', 'description', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'assigned_object', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'mac_address', 'description')
+
+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_assigned_object(self, obj):
+        if obj.assigned_object is None:
+            return None
+        serializer = get_serializer_for_model(obj.assigned_object)
+        context = {'request': self.context['request']}
+        return serializer(obj.assigned_object, nested=True, context=context).data
--- a/netbox/dcim/api/serializers_/devicetype_components.py
+++ b/netbox/dcim/api/serializers_/devicetype_components.py
@@ -1,18 +1,17 @@
 from django.contrib.contenttypes.models import ContentType
+from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers

 from dcim.choices import *
 from dcim.constants import *
 from dcim.models import (
    ConsolePortTemplate, ConsoleServerPortTemplate, DeviceBayTemplate, FrontPortTemplate, InterfaceTemplate,
-    InventoryItemTemplate, ModuleBayTemplate, PortTemplateMapping, PowerOutletTemplate, PowerPortTemplate,
-    RearPortTemplate,
+    InventoryItemTemplate, ModuleBayTemplate, PowerOutletTemplate, PowerPortTemplate, RearPortTemplate,
 )
 from netbox.api.fields import ChoiceField, ContentTypeField
-from netbox.api.gfk_fields import GFKSerializerField
 from netbox.api.serializers import ChangeLogMessageSerializer, ValidatedModelSerializer
+from utilities.api import get_serializer_for_model
 from wireless.choices import *
-from .base import PortSerializer
 from .devicetypes import DeviceTypeSerializer, ModuleTypeSerializer
 from .manufacturers import ManufacturerSerializer
 from .nested import NestedInterfaceTemplateSerializer
@@ -207,20 +206,7 @@ class InterfaceTemplateSerializer(ComponentTemplateSerializer):
        brief_fields = ('id', 'url', 'display', 'name', 'description')


-class RearPortTemplateMappingSerializer(serializers.ModelSerializer):
-    position = serializers.IntegerField(
-        source='rear_port_position'
-    )
-    front_port = serializers.PrimaryKeyRelatedField(
-        queryset=FrontPortTemplate.objects.all(),
-    )
-
-    class Meta:
-        model = PortTemplateMapping
-        fields = ('position', 'front_port', 'front_port_position')
-
-
-class RearPortTemplateSerializer(ComponentTemplateSerializer, PortSerializer):
+class RearPortTemplateSerializer(ComponentTemplateSerializer):
    device_type = DeviceTypeSerializer(
        required=False,
        nested=True,
@@ -234,35 +220,17 @@ class RearPortTemplateSerializer(ComponentTemplateSerializer, PortSerializer):
        default=None
    )
    type = ChoiceField(choices=PortTypeChoices)
-    front_ports = RearPortTemplateMappingSerializer(
-        source='mappings',
-        many=True,
-        required=False,
-    )

    class Meta:
        model = RearPortTemplate
        fields = [
-            'id', 'url', 'display', 'device_type', 'module_type', 'name', 'label', 'type', 'color', 'positions',
-            'front_ports', 'description', 'created', 'last_updated',
+            'id', 'url', 'display', 'device_type', 'module_type', 'name', 'label', 'type', 'color',
+            'positions', 'description', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description')


-class FrontPortTemplateMappingSerializer(serializers.ModelSerializer):
-    position = serializers.IntegerField(
-        source='front_port_position'
-    )
-    rear_port = serializers.PrimaryKeyRelatedField(
-        queryset=RearPortTemplate.objects.all(),
-    )
-
-    class Meta:
-        model = PortTemplateMapping
-        fields = ('position', 'rear_port', 'rear_port_position')
-
-
-class FrontPortTemplateSerializer(ComponentTemplateSerializer, PortSerializer):
+class FrontPortTemplateSerializer(ComponentTemplateSerializer):
    device_type = DeviceTypeSerializer(
        nested=True,
        required=False,
@@ -276,17 +244,13 @@ class FrontPortTemplateSerializer(ComponentTemplateSerializer, PortSerializer):
        default=None
    )
    type = ChoiceField(choices=PortTypeChoices)
-    rear_ports = FrontPortTemplateMappingSerializer(
-        source='mappings',
-        many=True,
-        required=False,
-    )
+    rear_port = RearPortTemplateSerializer(nested=True)

    class Meta:
        model = FrontPortTemplate
        fields = [
-            'id', 'url', 'display', 'device_type', 'module_type', 'name', 'label', 'type', 'color', 'positions',
-            'rear_ports', 'description', 'created', 'last_updated',
+            'id', 'url', 'display', 'device_type', 'module_type', 'name', 'label', 'type', 'color',
+            'rear_port', 'rear_port_position', 'description', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description')

@@ -349,7 +313,7 @@ class InventoryItemTemplateSerializer(ComponentTemplateSerializer):
        required=False,
        allow_null=True
    )
-    component = GFKSerializerField(read_only=True)
+    component = serializers.SerializerMethodField(read_only=True, allow_null=True)
    _depth = serializers.IntegerField(source='level', read_only=True)

    class Meta:
@@ -360,3 +324,11 @@ class InventoryItemTemplateSerializer(ComponentTemplateSerializer):
            '_depth',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description', '_depth')
+
+    @extend_schema_field(serializers.JSONField(allow_null=True))
+    def get_component(self, obj):
+        if obj.component is None:
+            return None
+        serializer = get_serializer_for_model(obj.component)
+        context = {'request': self.context['request']}
+        return serializer(obj.component, nested=True, context=context).data
--- a/netbox/dcim/api/serializers_/devicetypes.py
+++ b/netbox/dcim/api/serializers_/devicetypes.py
@@ -5,8 +5,8 @@ from rest_framework import serializers

 from dcim.choices import *
 from dcim.models import DeviceType, ModuleType, ModuleTypeProfile
-from netbox.api.fields import AttributesField, ChoiceField
-from netbox.api.serializers import PrimaryModelSerializer
+from netbox.api.fields import AttributesField, ChoiceField, RelatedObjectCountField
+from netbox.api.serializers import NetBoxModelSerializer
 from netbox.choices import *
 from .manufacturers import ManufacturerSerializer
 from .platforms import PlatformSerializer
@@ -18,7 +18,7 @@ __all__ = (
 )


-class DeviceTypeSerializer(PrimaryModelSerializer):
+class DeviceTypeSerializer(NetBoxModelSerializer):
    manufacturer = ManufacturerSerializer(nested=True)
    default_platform = PlatformSerializer(nested=True, required=False, allow_null=True)
    u_height = serializers.DecimalField(
@@ -45,14 +45,16 @@ class DeviceTypeSerializer(PrimaryModelSerializer):
    device_bay_template_count = serializers.IntegerField(read_only=True)
    module_bay_template_count = serializers.IntegerField(read_only=True)
    inventory_item_template_count = serializers.IntegerField(read_only=True)
-    device_count = serializers.IntegerField(read_only=True)
+
+    # Related object counts
+    device_count = RelatedObjectCountField('instances')

    class Meta:
        model = DeviceType
        fields = [
            'id', 'url', 'display_url', 'display', 'manufacturer', 'default_platform', 'model', 'slug', 'part_number',
            'u_height', 'exclude_from_utilization', 'is_full_depth', 'subdevice_role', 'airflow', 'weight',
-            'weight_unit', 'front_image', 'rear_image', 'description', 'owner', 'comments', 'tags', 'custom_fields',
+            'weight_unit', 'front_image', 'rear_image', 'description', 'comments', 'tags', 'custom_fields',
            'created', 'last_updated', 'device_count', 'console_port_template_count',
            'console_server_port_template_count', 'power_port_template_count', 'power_outlet_template_count',
            'interface_template_count', 'front_port_template_count', 'rear_port_template_count',
@@ -61,18 +63,18 @@ class DeviceTypeSerializer(PrimaryModelSerializer):
        brief_fields = ('id', 'url', 'display', 'manufacturer', 'model', 'slug', 'description', 'device_count')


-class ModuleTypeProfileSerializer(PrimaryModelSerializer):
+class ModuleTypeProfileSerializer(NetBoxModelSerializer):

    class Meta:
        model = ModuleTypeProfile
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'description', 'schema', 'owner', 'comments', 'tags',
-            'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'name', 'description', 'schema', 'comments', 'tags', 'custom_fields',
+            'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description')


-class ModuleTypeSerializer(PrimaryModelSerializer):
+class ModuleTypeSerializer(NetBoxModelSerializer):
    profile = ModuleTypeProfileSerializer(
        nested=True,
        required=False,
@@ -98,13 +100,12 @@ class ModuleTypeSerializer(PrimaryModelSerializer):
        required=False,
        allow_null=True
    )
-    module_count = serializers.IntegerField(read_only=True)

    class Meta:
        model = ModuleType
        fields = [
            'id', 'url', 'display_url', 'display', 'profile', 'manufacturer', 'model', 'part_number', 'airflow',
-            'weight', 'weight_unit', 'description', 'attributes', 'owner', 'comments', 'tags', 'custom_fields',
-            'created', 'last_updated', 'module_count',
+            'weight', 'weight_unit', 'description', 'attributes', 'comments', 'tags', 'custom_fields', 'created',
+            'last_updated',
        ]
-        brief_fields = ('id', 'url', 'display', 'profile', 'manufacturer', 'model', 'description', 'module_count')
+        brief_fields = ('id', 'url', 'display', 'profile', 'manufacturer', 'model', 'description')
--- a/netbox/dcim/api/serializers_/manufacturers.py
+++ b/netbox/dcim/api/serializers_/manufacturers.py
@@ -1,13 +1,13 @@
 from dcim.models import Manufacturer
 from netbox.api.fields import RelatedObjectCountField
-from netbox.api.serializers import OrganizationalModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer

 __all__ = (
    'ManufacturerSerializer',
 )


-class ManufacturerSerializer(OrganizationalModelSerializer):
+class ManufacturerSerializer(NetBoxModelSerializer):

    # Related object counts
    devicetype_count = RelatedObjectCountField('device_types')
@@ -17,7 +17,7 @@ class ManufacturerSerializer(OrganizationalModelSerializer):
    class Meta:
        model = Manufacturer
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'description', 'owner', 'tags', 'custom_fields',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'description', 'tags', 'custom_fields',
            'created', 'last_updated', 'devicetype_count', 'inventoryitem_count', 'platform_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'devicetype_count')
--- a/netbox/dcim/api/serializers_/platforms.py
+++ b/netbox/dcim/api/serializers_/platforms.py
@@ -24,7 +24,7 @@ class PlatformSerializer(NestedGroupModelSerializer):
        model = Platform
        fields = [
            'id', 'url', 'display_url', 'display', 'parent', 'name', 'slug', 'manufacturer', 'config_template',
-            'description', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count',
+            'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count',
            'virtualmachine_count', '_depth',
        ]
        brief_fields = (
--- a/netbox/dcim/api/serializers_/power.py
+++ b/netbox/dcim/api/serializers_/power.py
@@ -1,7 +1,7 @@
 from dcim.choices import *
 from dcim.models import PowerFeed, PowerPanel
 from netbox.api.fields import ChoiceField, RelatedObjectCountField
-from netbox.api.serializers import PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from tenancy.api.serializers_.tenants import TenantSerializer
 from .base import ConnectedEndpointsSerializer
 from .cables import CabledObjectSerializer
@@ -14,7 +14,7 @@ __all__ = (
 )


-class PowerPanelSerializer(PrimaryModelSerializer):
+class PowerPanelSerializer(NetBoxModelSerializer):
    site = SiteSerializer(nested=True)
    location = LocationSerializer(
        nested=True,
@@ -29,13 +29,13 @@ class PowerPanelSerializer(PrimaryModelSerializer):
    class Meta:
        model = PowerPanel
        fields = [
-            'id', 'url', 'display_url', 'display', 'site', 'location', 'name', 'description', 'owner', 'comments',
-            'tags', 'custom_fields', 'powerfeed_count', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'site', 'location', 'name', 'description', 'comments', 'tags',
+            'custom_fields', 'powerfeed_count', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description', 'powerfeed_count')


-class PowerFeedSerializer(PrimaryModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer):
+class PowerFeedSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer):
    power_panel = PowerPanelSerializer(nested=True)
    rack = RackSerializer(
        nested=True,
@@ -71,7 +71,6 @@ class PowerFeedSerializer(PrimaryModelSerializer, CabledObjectSerializer, Connec
            'id', 'url', 'display_url', 'display', 'power_panel', 'rack', 'name', 'status', 'type', 'supply',
            'phase', 'voltage', 'amperage', 'max_utilization', 'mark_connected', 'cable', 'cable_end', 'link_peers',
            'link_peers_type', 'connected_endpoints', 'connected_endpoints_type', 'connected_endpoints_reachable',
-            'description', 'tenant', 'owner', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
-            '_occupied',
+            'description', 'tenant', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', '_occupied',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description', 'cable', '_occupied')
--- a/netbox/dcim/api/serializers_/racks.py
+++ b/netbox/dcim/api/serializers_/racks.py
@@ -5,7 +5,7 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.models import Rack, RackReservation, RackRole, RackType
 from netbox.api.fields import ChoiceField, RelatedObjectCountField
-from netbox.api.serializers import OrganizationalModelSerializer, PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from netbox.choices import *
 from netbox.config import ConfigItem
 from tenancy.api.serializers_.tenants import TenantSerializer
@@ -22,7 +22,7 @@ __all__ = (
 )


-class RackRoleSerializer(OrganizationalModelSerializer):
+class RackRoleSerializer(NetBoxModelSerializer):

    # Related object counts
    rack_count = RelatedObjectCountField('racks')
@@ -30,13 +30,13 @@ class RackRoleSerializer(OrganizationalModelSerializer):
    class Meta:
        model = RackRole
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'owner', 'tags',
-            'custom_fields', 'created', 'last_updated', 'rack_count',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'tags', 'custom_fields',
+            'created', 'last_updated', 'rack_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'rack_count')


-class RackBaseSerializer(PrimaryModelSerializer):
+class RackBaseSerializer(NetBoxModelSerializer):
    form_factor = ChoiceField(
        choices=RackFormFactorChoices,
        allow_blank=True,
@@ -62,18 +62,19 @@ class RackBaseSerializer(PrimaryModelSerializer):


 class RackTypeSerializer(RackBaseSerializer):
-    manufacturer = ManufacturerSerializer(nested=True)
-    rack_count = serializers.IntegerField(read_only=True)
+    manufacturer = ManufacturerSerializer(
+        nested=True
+    )

    class Meta:
        model = RackType
        fields = [
            'id', 'url', 'display_url', 'display', 'manufacturer', 'model', 'slug', 'description', 'form_factor',
            'width', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_height', 'outer_depth',
-            'outer_unit', 'weight', 'max_weight', 'weight_unit', 'mounting_depth', 'description', 'owner', 'comments',
-            'tags', 'custom_fields', 'created', 'last_updated', 'rack_count',
+            'outer_unit', 'weight', 'max_weight', 'weight_unit', 'mounting_depth', 'description', 'comments', 'tags',
+            'custom_fields', 'created', 'last_updated',
        ]
-        brief_fields = ('id', 'url', 'display', 'manufacturer', 'model', 'slug', 'description', 'rack_count')
+        brief_fields = ('id', 'url', 'display', 'manufacturer', 'model', 'slug', 'description')


 class RackSerializer(RackBaseSerializer):
@@ -129,13 +130,13 @@ class RackSerializer(RackBaseSerializer):
            'id', 'url', 'display_url', 'display', 'name', 'facility_id', 'site', 'location', 'tenant', 'status',
            'role', 'serial', 'asset_tag', 'rack_type', 'form_factor', 'width', 'u_height', 'starting_unit', 'weight',
            'max_weight', 'weight_unit', 'desc_units', 'outer_width', 'outer_height', 'outer_depth', 'outer_unit',
-            'mounting_depth', 'airflow', 'description', 'owner', 'comments', 'tags', 'custom_fields', 'created',
-            'last_updated', 'device_count', 'powerfeed_count',
+            'mounting_depth', 'airflow', 'description', 'comments', 'tags', 'custom_fields',
+            'created', 'last_updated', 'device_count', 'powerfeed_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'description', 'device_count')


-class RackReservationSerializer(PrimaryModelSerializer):
+class RackReservationSerializer(NetBoxModelSerializer):
    rack = RackSerializer(
        nested=True,
    )
@@ -156,7 +157,7 @@ class RackReservationSerializer(PrimaryModelSerializer):
        model = RackReservation
        fields = [
            'id', 'url', 'display_url', 'display', 'rack', 'units', 'status', 'created', 'last_updated', 'user',
-            'tenant', 'description', 'owner', 'comments', 'tags', 'custom_fields',
+            'tenant', 'description', 'comments', 'tags', 'custom_fields',
        ]
        brief_fields = ('id', 'url', 'display', 'status', 'user', 'description', 'units')

--- a/netbox/dcim/api/serializers_/roles.py
+++ b/netbox/dcim/api/serializers_/roles.py
@@ -3,7 +3,7 @@ from rest_framework import serializers
 from dcim.models import DeviceRole, InventoryItemRole
 from extras.api.serializers_.configtemplates import ConfigTemplateSerializer
 from netbox.api.fields import RelatedObjectCountField
-from netbox.api.serializers import NestedGroupModelSerializer, OrganizationalModelSerializer
+from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
 from .nested import NestedDeviceRoleSerializer

 __all__ = (
@@ -23,14 +23,14 @@ class DeviceRoleSerializer(NestedGroupModelSerializer):
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'vm_role', 'config_template', 'parent',
            'description', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', 'virtualmachine_count',
-            'owner', 'comments', '_depth',
+            'comments', '_depth',
        ]
        brief_fields = (
            'id', 'url', 'display', 'name', 'slug', 'description', 'device_count', 'virtualmachine_count', '_depth'
        )


-class InventoryItemRoleSerializer(OrganizationalModelSerializer):
+class InventoryItemRoleSerializer(NetBoxModelSerializer):

    # Related object counts
    inventoryitem_count = RelatedObjectCountField('inventory_items')
@@ -38,7 +38,7 @@ class InventoryItemRoleSerializer(OrganizationalModelSerializer):
    class Meta:
        model = InventoryItemRole
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'owner', 'tags',
-            'custom_fields', 'created', 'last_updated', 'inventoryitem_count',
+            'id', 'url', 'display_url', 'display', 'name', 'slug', 'color', 'description', 'tags', 'custom_fields',
+            'created', 'last_updated', 'inventoryitem_count',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'inventoryitem_count')
--- a/netbox/dcim/api/serializers_/sites.py
+++ b/netbox/dcim/api/serializers_/sites.py
@@ -6,7 +6,7 @@ from dcim.models import Location, Region, Site, SiteGroup
 from ipam.api.serializers_.asns import ASNSerializer
 from ipam.models import ASN
 from netbox.api.fields import ChoiceField, RelatedObjectCountField, SerializedPKRelatedField
-from netbox.api.serializers import NestedGroupModelSerializer, PrimaryModelSerializer
+from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
 from tenancy.api.serializers_.tenants import TenantSerializer
 from .nested import NestedLocationSerializer, NestedRegionSerializer, NestedSiteGroupSerializer

@@ -27,7 +27,7 @@ class RegionSerializer(NestedGroupModelSerializer):
        model = Region
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'slug', 'parent', 'description', 'tags', 'custom_fields',
-            'created', 'last_updated', 'site_count', 'prefix_count', 'owner', 'comments', '_depth',
+            'created', 'last_updated', 'site_count', 'prefix_count', 'comments', '_depth',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'site_count', '_depth')

@@ -41,12 +41,12 @@ class SiteGroupSerializer(NestedGroupModelSerializer):
        model = SiteGroup
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'slug', 'parent', 'description', 'tags', 'custom_fields',
-            'created', 'last_updated', 'site_count', 'prefix_count', 'owner', 'comments', '_depth',
+            'created', 'last_updated', 'site_count', 'prefix_count', 'comments', '_depth',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'site_count', '_depth')


-class SiteSerializer(PrimaryModelSerializer):
+class SiteSerializer(NetBoxModelSerializer):
    status = ChoiceField(choices=SiteStatusChoices, required=False)
    region = RegionSerializer(nested=True, required=False, allow_null=True)
    group = SiteGroupSerializer(nested=True, required=False, allow_null=True)
@@ -72,7 +72,7 @@ class SiteSerializer(PrimaryModelSerializer):
        model = Site
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'slug', 'status', 'region', 'group', 'tenant', 'facility',
-            'time_zone', 'description', 'physical_address', 'shipping_address', 'latitude', 'longitude', 'owner',
+            'time_zone', 'description', 'physical_address', 'shipping_address', 'latitude', 'longitude',
            'comments', 'asns', 'tags', 'custom_fields', 'created', 'last_updated', 'circuit_count', 'device_count',
            'prefix_count', 'rack_count', 'virtualmachine_count', 'vlan_count',
        ]
@@ -93,6 +93,6 @@ class LocationSerializer(NestedGroupModelSerializer):
        fields = [
            'id', 'url', 'display_url', 'display', 'name', 'slug', 'site', 'parent', 'status', 'tenant', 'facility',
            'description', 'tags', 'custom_fields', 'created', 'last_updated', 'rack_count', 'device_count',
-            'prefix_count', 'owner', 'comments', '_depth',
+            'prefix_count', 'comments', '_depth',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'rack_count', '_depth')
--- a/netbox/dcim/api/serializers_/virtualchassis.py
+++ b/netbox/dcim/api/serializers_/virtualchassis.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers

 from dcim.models import VirtualChassis
-from netbox.api.serializers import PrimaryModelSerializer
+from netbox.api.serializers import NetBoxModelSerializer
 from .nested import NestedDeviceSerializer

 __all__ = (
@@ -9,7 +9,7 @@ __all__ = (
 )


-class VirtualChassisSerializer(PrimaryModelSerializer):
+class VirtualChassisSerializer(NetBoxModelSerializer):
    master = NestedDeviceSerializer(required=False, allow_null=True, default=None)
    members = NestedDeviceSerializer(many=True, read_only=True)

@@ -19,7 +19,7 @@ class VirtualChassisSerializer(PrimaryModelSerializer):
    class Meta:
        model = VirtualChassis
        fields = [
-            'id', 'url', 'display_url', 'display', 'name', 'domain', 'master', 'description', 'owner', 'comments',
-            'tags', 'custom_fields', 'created', 'last_updated', 'member_count', 'members',
+            'id', 'url', 'display_url', 'display', 'name', 'domain', 'master', 'description', 'comments', 'tags',
+            'custom_fields', 'created', 'last_updated', 'member_count', 'members',
        ]
        brief_fields = ('id', 'url', 'display', 'name', 'master', 'description', 'member_count')
--- a/netbox/dcim/apps.py
+++ b/netbox/dcim/apps.py
@@ -11,7 +11,7 @@ class DCIMConfig(AppConfig):
        from netbox.models.features import register_models
        from utilities.counters import connect_counters
        from . import signals, search  # noqa: F401
-        from .models import CableTermination, Device, DeviceType, ModuleType, RackType, VirtualChassis
+        from .models import CableTermination, Device, DeviceType, VirtualChassis

        # Register models
        register_models(*self.get_models())
@@ -31,4 +31,4 @@ class DCIMConfig(AppConfig):
        })

        # Register counters
-        connect_counters(Device, DeviceType, ModuleType, RackType, VirtualChassis)
+        connect_counters(Device, DeviceType, VirtualChassis)
--- a/netbox/dcim/cable_profiles.py
+++ b/netbox/dcim/cable_profiles.py
@@ -1,108 +0,0 @@
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-
-from dcim.models import CableTermination
-
-
-class BaseCableProfile:
-    # Maximum number of terminations allowed per side
-    a_max_connections = None
-    b_max_connections = None
-
-    def clean(self, cable):
-        # Enforce maximum connection limits
-        if self.a_max_connections and len(cable.a_terminations) > self.a_max_connections:
-            raise ValidationError({
-                'a_terminations': _(
-                    'Maximum A side connections for profile {profile}: {max}'
-                ).format(
-                    profile=cable.get_profile_display(),
-                    max=self.a_max_connections,
-                )
-            })
-        if self.b_max_connections and len(cable.b_terminations) > self.b_max_connections:
-            raise ValidationError({
-                'b_terminations': _(
-                    'Maximum B side connections for profile {profile}: {max}'
-                ).format(
-                    profile=cable.get_profile_display(),
-                    max=self.b_max_connections,
-                )
-            })
-
-    def get_mapped_position(self, side, position):
-        """
-        Return the mapped position for a given cable end and position.
-
-        By default, assume all positions are symmetrical.
-        """
-        return position
-
-    def get_peer_terminations(self, terminations, position_stack):
-        local_end = terminations[0].cable_end
-        qs = CableTermination.objects.filter(
-            cable=terminations[0].cable,
-            cable_end=terminations[0].opposite_cable_end
-        )
-
-        # TODO: Optimize this to use a single query under any condition
-        if position_stack:
-            # Attempt to find a peer termination at the same position currently in the stack. Pop the stack only if
-            # we find one. Otherwise, return any peer terminations with a null position.
-            position = self.get_mapped_position(local_end, position_stack[-1][0])
-            if peers := qs.filter(position=position):
-                position_stack.pop()
-                return peers
-
-        return qs.filter(position=None)
-
-
-class StraightSingleCableProfile(BaseCableProfile):
-    a_max_connections = 1
-    b_max_connections = 1
-
-
-class StraightMultiCableProfile(BaseCableProfile):
-    a_max_connections = None
-    b_max_connections = None
-
-
-class Shuffle2x2MPO8CableProfile(BaseCableProfile):
-    a_max_connections = 8
-    b_max_connections = 8
-    _mapping = {
-        1: 1,
-        2: 2,
-        3: 5,
-        4: 6,
-        5: 3,
-        6: 4,
-        7: 7,
-        8: 8,
-    }
-
-    def get_mapped_position(self, side, position):
-        return self._mapping.get(position)
-
-
-class Shuffle4x4MPO8CableProfile(BaseCableProfile):
-    a_max_connections = 8
-    b_max_connections = 8
-    # A side to B side position mapping
-    _a_mapping = {
-        1: 1,
-        2: 3,
-        3: 5,
-        4: 7,
-        5: 2,
-        6: 4,
-        7: 6,
-        8: 8,
-    }
-    # B side to A side position mapping (reverse of _a_mapping)
-    _b_mapping = {v: k for k, v in _a_mapping.items()}
-
-    def get_mapped_position(self, side, position):
-        if side.lower() == 'b':
-            return self._b_mapping.get(position)
-        return self._a_mapping.get(position)
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -461,7 +461,6 @@ class PowerPortTypeChoices(ChoiceSet):
    # Molex
    TYPE_MOLEX_MICRO_FIT_1X2 = 'molex-micro-fit-1x2'
    TYPE_MOLEX_MICRO_FIT_2X2 = 'molex-micro-fit-2x2'
-    TYPE_MOLEX_MICRO_FIT_2X3 = 'molex-micro-fit-2x3'
    TYPE_MOLEX_MICRO_FIT_2X4 = 'molex-micro-fit-2x4'
    # Direct current (DC)
    TYPE_DC = 'dc-terminal'
@@ -589,7 +588,6 @@ class PowerPortTypeChoices(ChoiceSet):
        ('Molex', (
            (TYPE_MOLEX_MICRO_FIT_1X2, 'Molex Micro-Fit 1x2'),
            (TYPE_MOLEX_MICRO_FIT_2X2, 'Molex Micro-Fit 2x2'),
-            (TYPE_MOLEX_MICRO_FIT_2X3, 'Molex Micro-Fit 2x3'),
            (TYPE_MOLEX_MICRO_FIT_2X4, 'Molex Micro-Fit 2x4'),
        )),
        ('DC', (
@@ -712,7 +710,6 @@ class PowerOutletTypeChoices(ChoiceSet):
    # Molex
    TYPE_MOLEX_MICRO_FIT_1X2 = 'molex-micro-fit-1x2'
    TYPE_MOLEX_MICRO_FIT_2X2 = 'molex-micro-fit-2x2'
-    TYPE_MOLEX_MICRO_FIT_2X3 = 'molex-micro-fit-2x3'
    TYPE_MOLEX_MICRO_FIT_2X4 = 'molex-micro-fit-2x4'
    # Direct current (DC)
    TYPE_DC = 'dc-terminal'
@@ -834,7 +831,6 @@ class PowerOutletTypeChoices(ChoiceSet):
        ('Molex', (
            (TYPE_MOLEX_MICRO_FIT_1X2, 'Molex Micro-Fit 1x2'),
            (TYPE_MOLEX_MICRO_FIT_2X2, 'Molex Micro-Fit 2x2'),
-            (TYPE_MOLEX_MICRO_FIT_2X3, 'Molex Micro-Fit 2x3'),
            (TYPE_MOLEX_MICRO_FIT_2X4, 'Molex Micro-Fit 2x4'),
        )),
        ('DC', (
@@ -1721,19 +1717,6 @@ class PortTypeChoices(ChoiceSet):
 # Cables/links
 #

-class CableProfileChoices(ChoiceSet):
-    STRAIGHT_SINGLE = 'straight-single'
-    STRAIGHT_MULTI = 'straight-multi'
-    SHUFFLE_2X2_MPO8 = 'shuffle-2x2-mpo8'
-    SHUFFLE_4X4_MPO8 = 'shuffle-4x4-mpo8'
-
-    CHOICES = (
-        (STRAIGHT_SINGLE, _('Straight (single position)')),
-        (STRAIGHT_MULTI, _('Straight (multi-position)')),
-        (SHUFFLE_2X2_MPO8, _('Shuffle (2x2 MPO8)')),
-        (SHUFFLE_4X4_MPO8, _('Shuffle (4x4 MPO8)')),
-    )
-

 class CableTypeChoices(ChoiceSet):
    # Copper - Twisted Pair (UTP/STP)
@@ -1753,15 +1736,6 @@ class CableTypeChoices(ChoiceSet):

    # Copper - Coaxial
    TYPE_COAXIAL = 'coaxial'
-    TYPE_RG_6 = 'rg-6'
-    TYPE_RG_8 = 'rg-8'
-    TYPE_RG_11 = 'rg-11'
-    TYPE_RG_59 = 'rg-59'
-    TYPE_RG_62 = 'rg-62'
-    TYPE_RG_213 = 'rg-213'
-    TYPE_LMR_100 = 'lmr-100'
-    TYPE_LMR_200 = 'lmr-200'
-    TYPE_LMR_400 = 'lmr-400'

    # Fiber Optic - Multimode
    TYPE_MMF = 'mmf'
@@ -1811,15 +1785,6 @@ class CableTypeChoices(ChoiceSet):
            _('Copper - Coaxial'),
            (
                (TYPE_COAXIAL, 'Coaxial'),
-                (TYPE_RG_6, 'RG-6'),
-                (TYPE_RG_8, 'RG-8'),
-                (TYPE_RG_11, 'RG-11'),
-                (TYPE_RG_59, 'RG-59'),
-                (TYPE_RG_62, 'RG-62'),
-                (TYPE_RG_213, 'RG-213'),
-                (TYPE_LMR_100, 'LMR-100'),
-                (TYPE_LMR_200, 'LMR-200'),
-                (TYPE_LMR_400, 'LMR-400'),
            ),
        ),
        (
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -20,20 +20,12 @@ RACK_ELEVATION_DEFAULT_MARGIN_WIDTH = 15
 RACK_STARTING_UNIT_DEFAULT = 1


-#
-# Cables
-#
-
-CABLE_POSITION_MIN = 1
-CABLE_POSITION_MAX = 1024
-
-
 #
 # RearPorts
 #

-PORT_POSITION_MIN = 1
-PORT_POSITION_MAX = 1024
+REARPORT_POSITIONS_MIN = 1
+REARPORT_POSITIONS_MAX = 1024


 #
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -11,20 +11,19 @@ from ipam.filtersets import PrimaryIPFilterSet
 from ipam.models import ASN, IPAddress, VLANTranslationPolicy, VRF
 from netbox.choices import ColorChoices
 from netbox.filtersets import (
-    AttributeFiltersMixin, BaseFilterSet, ChangeLoggedModelFilterSet, NestedGroupModelFilterSet,
-    OrganizationalModelFilterSet, PrimaryModelFilterSet, NetBoxModelFilterSet,
+    AttributeFiltersMixin, BaseFilterSet, ChangeLoggedModelFilterSet, NestedGroupModelFilterSet, NetBoxModelFilterSet,
+    OrganizationalModelFilterSet,
 )
-from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
+from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet
 from tenancy.models import *
-from users.filterset_mixins import OwnerFilterMixin
 from users.models import User
 from utilities.filters import (
    ContentTypeFilter, MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, MultiValueWWNFilter,
    NumericArrayFilter, TreeNodeMultipleChoiceFilter,
 )
-from virtualization.models import Cluster, ClusterGroup, VirtualMachine, VMInterface
+from virtualization.models import Cluster, ClusterGroup, VMInterface, VirtualMachine
 from vpn.models import L2VPN
-from wireless.choices import WirelessChannelChoices, WirelessRoleChoices
+from wireless.choices import WirelessRoleChoices, WirelessChannelChoices
 from wireless.models import WirelessLAN, WirelessLink
 from .choices import *
 from .constants import *
@@ -144,7 +143,7 @@ class SiteGroupFilterSet(NestedGroupModelFilterSet, ContactModelFilterSet):
        fields = ('id', 'name', 'slug', 'description')


-class SiteFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
+class SiteFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
    status = django_filters.MultipleChoiceFilter(
        choices=SiteStatusChoices,
        null_value=None
@@ -294,7 +293,7 @@ class RackRoleFilterSet(OrganizationalModelFilterSet):
        fields = ('id', 'name', 'slug', 'color', 'description')


-class RackTypeFilterSet(PrimaryModelFilterSet):
+class RackTypeFilterSet(NetBoxModelFilterSet):
    manufacturer_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Manufacturer.objects.all(),
        label=_('Manufacturer (ID)'),
@@ -317,9 +316,6 @@ class RackTypeFilterSet(PrimaryModelFilterSet):
        fields = (
            'id', 'model', 'slug', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_height',
            'outer_depth', 'outer_unit', 'mounting_depth', 'weight', 'max_weight', 'weight_unit', 'description',
-
-            # Counters
-            'rack_count',
        )

    def search(self, queryset, name, value):
@@ -332,7 +328,7 @@ class RackTypeFilterSet(PrimaryModelFilterSet):
        )


-class RackFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
+class RackFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
    region_id = TreeNodeMultipleChoiceFilter(
        queryset=Region.objects.all(),
        field_name='site__region',
@@ -448,7 +444,7 @@ class RackFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterS
        )


-class RackReservationFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
+class RackReservationFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
    rack_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Rack.objects.all(),
        label=_('Rack (ID)'),
@@ -544,7 +540,7 @@ class ManufacturerFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet)
        fields = ('id', 'name', 'slug', 'description')


-class DeviceTypeFilterSet(PrimaryModelFilterSet):
+class DeviceTypeFilterSet(NetBoxModelFilterSet):
    manufacturer_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Manufacturer.objects.all(),
        label=_('Manufacturer (ID)'),
@@ -630,7 +626,6 @@ class DeviceTypeFilterSet(PrimaryModelFilterSet):
            'device_bay_template_count',
            'module_bay_template_count',
            'inventory_item_template_count',
-            'device_count',
        )

    def search(self, queryset, name, value):
@@ -687,7 +682,7 @@ class DeviceTypeFilterSet(PrimaryModelFilterSet):
        return queryset.exclude(inventoryitemtemplates__isnull=value)


-class ModuleTypeProfileFilterSet(PrimaryModelFilterSet):
+class ModuleTypeProfileFilterSet(NetBoxModelFilterSet):

    class Meta:
        model = ModuleTypeProfile
@@ -703,7 +698,7 @@ class ModuleTypeProfileFilterSet(PrimaryModelFilterSet):
        )


-class ModuleTypeFilterSet(AttributeFiltersMixin, PrimaryModelFilterSet):
+class ModuleTypeFilterSet(AttributeFiltersMixin, NetBoxModelFilterSet):
    profile_id = django_filters.ModelMultipleChoiceFilter(
        queryset=ModuleTypeProfile.objects.all(),
        label=_('Profile (ID)'),
@@ -751,12 +746,7 @@ class ModuleTypeFilterSet(AttributeFiltersMixin, PrimaryModelFilterSet):

    class Meta:
        model = ModuleType
-        fields = (
-            'id', 'model', 'part_number', 'airflow', 'weight', 'weight_unit', 'description',
-
-            # Counters
-            'module_count',
-        )
+        fields = ('id', 'model', 'part_number', 'airflow', 'weight', 'weight_unit', 'description')

    def search(self, queryset, name, value):
        if not value.strip():
@@ -885,15 +875,12 @@ class FrontPortTemplateFilterSet(ChangeLoggedModelFilterSet, ModularDeviceTypeCo
        null_value=None
    )
    rear_port_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='mappings__rear_port',
-        queryset=RearPort.objects.all(),
-        to_field_name='rear_port',
-        label=_('Rear port (ID)'),
+        queryset=RearPort.objects.all()
    )

    class Meta:
        model = FrontPortTemplate
-        fields = ('id', 'name', 'label', 'type', 'color', 'positions', 'description')
+        fields = ('id', 'name', 'label', 'type', 'color', 'rear_port_position', 'description')


 class RearPortTemplateFilterSet(ChangeLoggedModelFilterSet, ModularDeviceTypeComponentFilterSet):
@@ -901,12 +888,6 @@ class RearPortTemplateFilterSet(ChangeLoggedModelFilterSet, ModularDeviceTypeCom
        choices=PortTypeChoices,
        null_value=None
    )
-    front_port_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='mappings__front_port',
-        queryset=FrontPort.objects.all(),
-        to_field_name='front_port',
-        label=_('Front port (ID)'),
-    )

    class Meta:
        model = RearPortTemplate
@@ -970,7 +951,7 @@ class InventoryItemTemplateFilterSet(ChangeLoggedModelFilterSet, DeviceTypeCompo
        return queryset.filter(qs_filter)


-class DeviceRoleFilterSet(NestedGroupModelFilterSet):
+class DeviceRoleFilterSet(OrganizationalModelFilterSet):
    config_template_id = django_filters.ModelMultipleChoiceFilter(
        queryset=ConfigTemplate.objects.all(),
        label=_('Config template (ID)'),
@@ -1004,7 +985,7 @@ class DeviceRoleFilterSet(NestedGroupModelFilterSet):
        fields = ('id', 'name', 'slug', 'color', 'vm_role', 'description')


-class PlatformFilterSet(NestedGroupModelFilterSet):
+class PlatformFilterSet(OrganizationalModelFilterSet):
    parent_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Platform.objects.all(),
        label=_('Immediate parent platform (ID)'),
@@ -1062,7 +1043,7 @@ class PlatformFilterSet(NestedGroupModelFilterSet):


 class DeviceFilterSet(
-    PrimaryModelFilterSet,
+    NetBoxModelFilterSet,
    TenancyFilterSet,
    ContactModelFilterSet,
    LocalConfigContextFilterSet,
@@ -1307,6 +1288,7 @@ class DeviceFilterSet(
            Q(name__icontains=value) |
            Q(virtual_chassis__name__icontains=value) |
            Q(serial__icontains=value.strip()) |
+            Q(inventoryitems__serial__icontains=value.strip()) |
            Q(asset_tag__icontains=value.strip()) |
            Q(description__icontains=value.strip()) |
            Q(comments__icontains=value) |
@@ -1363,7 +1345,7 @@ class DeviceFilterSet(
        return queryset.exclude(params)


-class VirtualDeviceContextFilterSet(PrimaryModelFilterSet, TenancyFilterSet, PrimaryIPFilterSet):
+class VirtualDeviceContextFilterSet(NetBoxModelFilterSet, TenancyFilterSet, PrimaryIPFilterSet):
    device_id = django_filters.ModelMultipleChoiceFilter(
        field_name='device',
        queryset=Device.objects.all(),
@@ -1412,7 +1394,7 @@ class VirtualDeviceContextFilterSet(PrimaryModelFilterSet, TenancyFilterSet, Pri
        return queryset.exclude(params)


-class ModuleFilterSet(PrimaryModelFilterSet):
+class ModuleFilterSet(NetBoxModelFilterSet):
    manufacturer_id = django_filters.ModelMultipleChoiceFilter(
        field_name='module_type__manufacturer',
        queryset=Manufacturer.objects.all(),
@@ -1534,7 +1516,7 @@ class ModuleFilterSet(PrimaryModelFilterSet):
        ).distinct()


-class DeviceComponentFilterSet(OwnerFilterMixin, NetBoxModelFilterSet):
+class DeviceComponentFilterSet(django_filters.FilterSet):
    q = django_filters.CharFilter(
        method='search',
        label=_('Search'),
@@ -1700,7 +1682,12 @@ class PathEndpointFilterSet(django_filters.FilterSet):
            return queryset.filter(Q(_path__isnull=True) | Q(_path__is_active=False))


-class ConsolePortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet, PathEndpointFilterSet):
+class ConsolePortFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet,
+    PathEndpointFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=ConsolePortTypeChoices,
        null_value=None
@@ -1708,10 +1695,15 @@ class ConsolePortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSe

    class Meta:
        model = ConsolePort
-        fields = ('id', 'name', 'label', 'speed', 'description', 'mark_connected', 'cable_end', 'cable_position')
+        fields = ('id', 'name', 'label', 'speed', 'description', 'mark_connected', 'cable_end')


-class ConsoleServerPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet, PathEndpointFilterSet):
+class ConsoleServerPortFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet,
+    PathEndpointFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=ConsolePortTypeChoices,
        null_value=None
@@ -1719,10 +1711,15 @@ class ConsoleServerPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFi

    class Meta:
        model = ConsoleServerPort
-        fields = ('id', 'name', 'label', 'speed', 'description', 'mark_connected', 'cable_end', 'cable_position')
+        fields = ('id', 'name', 'label', 'speed', 'description', 'mark_connected', 'cable_end')


-class PowerPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet, PathEndpointFilterSet):
+class PowerPortFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet,
+    PathEndpointFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=PowerPortTypeChoices,
        null_value=None
@@ -1732,11 +1729,15 @@ class PowerPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet,
        model = PowerPort
        fields = (
            'id', 'name', 'label', 'maximum_draw', 'allocated_draw', 'description', 'mark_connected', 'cable_end',
-            'cable_position',
        )


-class PowerOutletFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet, PathEndpointFilterSet):
+class PowerOutletFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet,
+    PathEndpointFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=PowerOutletTypeChoices,
        null_value=None
@@ -1758,11 +1759,10 @@ class PowerOutletFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSe
        model = PowerOutlet
        fields = (
            'id', 'name', 'status', 'label', 'feed_leg', 'description', 'color', 'mark_connected', 'cable_end',
-            'cable_position',
        )


-class MACAddressFilterSet(PrimaryModelFilterSet):
+class MACAddressFilterSet(NetBoxModelFilterSet):
    mac_address = MultiValueMACAddressFilter()
    assigned_object_type = ContentTypeFilter()
    device = MultiValueCharFilter(
@@ -1807,14 +1807,6 @@ class MACAddressFilterSet(PrimaryModelFilterSet):
        queryset=VMInterface.objects.all(),
        label=_('VM interface (ID)'),
    )
-    assigned = django_filters.BooleanFilter(
-        method='filter_assigned',
-        label=_('Is assigned'),
-    )
-    primary = django_filters.BooleanFilter(
-        method='filter_primary',
-        label=_('Is primary'),
-    )

    class Meta:
        model = MACAddress
@@ -1851,29 +1843,6 @@ class MACAddressFilterSet(PrimaryModelFilterSet):
            vminterface__in=interface_ids
        )

-    def filter_assigned(self, queryset, name, value):
-        params = {
-            'assigned_object_type__isnull': True,
-            'assigned_object_id__isnull': True,
-        }
-        if value:
-            return queryset.exclude(**params)
-        else:
-            return queryset.filter(**params)
-
-    def filter_primary(self, queryset, name, value):
-        interface_mac_ids = Interface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        vminterface_mac_ids = VMInterface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        query = Q(pk__in=interface_mac_ids) | Q(pk__in=vminterface_mac_ids)
-        if value:
-            return queryset.filter(query)
-        else:
-            return queryset.exclude(query)
-

 class CommonInterfaceFilterSet(django_filters.FilterSet):
    mode = django_filters.MultipleChoiceFilter(
@@ -1945,6 +1914,7 @@ class CommonInterfaceFilterSet(django_filters.FilterSet):

 class InterfaceFilterSet(
    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
    CabledObjectFilterSet,
    PathEndpointFilterSet,
    CommonInterfaceFilterSet
@@ -2066,7 +2036,7 @@ class InterfaceFilterSet(
        fields = (
            'id', 'name', 'label', 'type', 'enabled', 'mtu', 'mgmt_only', 'poe_mode', 'poe_type', 'mode', 'rf_role',
            'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected',
-            'cable_id', 'cable_end', 'cable_position',
+            'cable_id', 'cable_end',
        )

    def filter_virtual_chassis_member_or_master(self, queryset, name, value):
@@ -2105,47 +2075,44 @@ class InterfaceFilterSet(
            )


-class FrontPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet):
+class FrontPortFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=PortTypeChoices,
        null_value=None
    )
    rear_port_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='mappings__rear_port',
-        queryset=RearPort.objects.all(),
-        to_field_name='rear_port',
-        label=_('Rear port (ID)'),
+        queryset=RearPort.objects.all()
    )

    class Meta:
        model = FrontPort
        fields = (
-            'id', 'name', 'label', 'type', 'color', 'positions', 'description', 'mark_connected', 'cable_end',
-            'cable_position',
+            'id', 'name', 'label', 'type', 'color', 'rear_port_position', 'description', 'mark_connected', 'cable_end',
        )


-class RearPortFilterSet(ModularDeviceComponentFilterSet, CabledObjectFilterSet):
+class RearPortFilterSet(
+    ModularDeviceComponentFilterSet,
+    NetBoxModelFilterSet,
+    CabledObjectFilterSet
+):
    type = django_filters.MultipleChoiceFilter(
        choices=PortTypeChoices,
        null_value=None
    )
-    front_port_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='mappings__front_port',
-        queryset=FrontPort.objects.all(),
-        to_field_name='front_port',
-        label=_('Front port (ID)'),
-    )

    class Meta:
        model = RearPort
        fields = (
            'id', 'name', 'label', 'type', 'color', 'positions', 'description', 'mark_connected', 'cable_end',
-            'cable_position',
        )


-class ModuleBayFilterSet(ModularDeviceComponentFilterSet):
+class ModuleBayFilterSet(ModularDeviceComponentFilterSet, NetBoxModelFilterSet):
    parent_id = django_filters.ModelMultipleChoiceFilter(
        queryset=ModuleBay.objects.all(),
        label=_('Parent module bay (ID)'),
@@ -2161,7 +2128,7 @@ class ModuleBayFilterSet(ModularDeviceComponentFilterSet):
        fields = ('id', 'name', 'label', 'position', 'description')


-class DeviceBayFilterSet(DeviceComponentFilterSet):
+class DeviceBayFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet):
    installed_device_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Device.objects.all(),
        label=_('Installed device (ID)'),
@@ -2178,7 +2145,7 @@ class DeviceBayFilterSet(DeviceComponentFilterSet):
        fields = ('id', 'name', 'label', 'description')


-class InventoryItemFilterSet(DeviceComponentFilterSet):
+class InventoryItemFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet):
    parent_id = django_filters.ModelMultipleChoiceFilter(
        queryset=InventoryItem.objects.all(),
        label=_('Parent inventory item (ID)'),
@@ -2237,7 +2204,7 @@ class InventoryItemRoleFilterSet(OrganizationalModelFilterSet):
        fields = ('id', 'name', 'slug', 'color', 'description')


-class VirtualChassisFilterSet(PrimaryModelFilterSet):
+class VirtualChassisFilterSet(NetBoxModelFilterSet):
    master_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Device.objects.all(),
        label=_('Master (ID)'),
@@ -2313,7 +2280,7 @@ class VirtualChassisFilterSet(PrimaryModelFilterSet):
        return queryset.filter(qs_filter).distinct()


-class CableFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
+class CableFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
    termination_a_type = ContentTypeFilter(
        field_name='terminations__termination_type'
    )
@@ -2338,9 +2305,6 @@ class CableFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
    status = django_filters.MultipleChoiceFilter(
        choices=LinkStatusChoices
    )
-    profile = django_filters.MultipleChoiceFilter(
-        choices=CableProfileChoices
-    )
    color = django_filters.MultipleChoiceFilter(
        choices=ColorChoices
    )
@@ -2490,10 +2454,10 @@ class CableTerminationFilterSet(ChangeLoggedModelFilterSet):

    class Meta:
        model = CableTermination
-        fields = ('id', 'cable', 'cable_end', 'position', 'termination_type', 'termination_id')
+        fields = ('id', 'cable', 'cable_end', 'termination_type', 'termination_id')


-class PowerPanelFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
+class PowerPanelFilterSet(NetBoxModelFilterSet, ContactModelFilterSet):
    region_id = TreeNodeMultipleChoiceFilter(
        queryset=Region.objects.all(),
        field_name='site__region',
@@ -2551,7 +2515,7 @@ class PowerPanelFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
        return queryset.filter(qs_filter)


-class PowerFeedFilterSet(PrimaryModelFilterSet, CabledObjectFilterSet, PathEndpointFilterSet, TenancyFilterSet):
+class PowerFeedFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet, PathEndpointFilterSet, TenancyFilterSet):
    region_id = TreeNodeMultipleChoiceFilter(
        queryset=Region.objects.all(),
        field_name='power_panel__site__region',
@@ -2607,7 +2571,7 @@ class PowerFeedFilterSet(PrimaryModelFilterSet, CabledObjectFilterSet, PathEndpo
        model = PowerFeed
        fields = (
            'id', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization',
-            'available_power', 'mark_connected', 'cable_end', 'cable_position', 'description',
+            'available_power', 'mark_connected', 'cable_end', 'description',
        )

    def search(self, queryset, name, value):
--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@@ -10,14 +10,14 @@ from extras.models import ConfigTemplate
 from ipam.choices import VLANQinQRoleChoices
 from ipam.models import ASN, VLAN, VLANGroup, VRF
 from netbox.choices import *
-from netbox.forms import (
-    NestedGroupModelBulkEditForm, NetBoxModelBulkEditForm, OrganizationalModelBulkEditForm, PrimaryModelBulkEditForm,
-)
-from netbox.forms.mixins import ChangelogMessageMixin, OwnerMixin
+from netbox.forms import NetBoxModelBulkEditForm
+from netbox.forms.mixins import ChangelogMessageMixin
 from tenancy.models import Tenant
 from users.models import User
 from utilities.forms import BulkEditForm, add_blank_choice, form_from_model
-from utilities.forms.fields import ColorField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField
+from utilities.forms.fields import (
+    ColorField, CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField,
+)
 from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups
 from utilities.forms.widgets import BulkEditNullBooleanSelect, NumberWithOptions
 from virtualization.models import Cluster
@@ -71,12 +71,18 @@ __all__ = (
 )


-class RegionBulkEditForm(NestedGroupModelBulkEditForm):
+class RegionBulkEditForm(NetBoxModelBulkEditForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=Region.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Region
    fieldsets = (
@@ -85,12 +91,18 @@ class RegionBulkEditForm(NestedGroupModelBulkEditForm):
    nullable_fields = ('parent', 'description', 'comments')


-class SiteGroupBulkEditForm(NestedGroupModelBulkEditForm):
+class SiteGroupBulkEditForm(NetBoxModelBulkEditForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=SiteGroup.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = SiteGroup
    fieldsets = (
@@ -99,7 +111,7 @@ class SiteGroupBulkEditForm(NestedGroupModelBulkEditForm):
    nullable_fields = ('parent', 'description', 'comments')


-class SiteBulkEditForm(PrimaryModelBulkEditForm):
+class SiteBulkEditForm(NetBoxModelBulkEditForm):
    status = forms.ChoiceField(
        label=_('Status'),
        choices=add_blank_choice(SiteStatusChoices),
@@ -150,6 +162,12 @@ class SiteBulkEditForm(PrimaryModelBulkEditForm):
        choices=add_blank_choice(TimeZoneFormField().choices),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Site
    fieldsets = (
@@ -160,7 +178,7 @@ class SiteBulkEditForm(PrimaryModelBulkEditForm):
    )


-class LocationBulkEditForm(NestedGroupModelBulkEditForm):
+class LocationBulkEditForm(NetBoxModelBulkEditForm):
    site = DynamicModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -190,6 +208,12 @@ class LocationBulkEditForm(NestedGroupModelBulkEditForm):
        max_length=50,
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Location
    fieldsets = (
@@ -198,11 +222,16 @@ class LocationBulkEditForm(NestedGroupModelBulkEditForm):
    nullable_fields = ('parent', 'tenant', 'facility', 'description', 'comments')


-class RackRoleBulkEditForm(OrganizationalModelBulkEditForm):
+class RackRoleBulkEditForm(NetBoxModelBulkEditForm):
    color = ColorField(
        label=_('Color'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )

    model = RackRole
    fieldsets = (
@@ -211,7 +240,7 @@ class RackRoleBulkEditForm(OrganizationalModelBulkEditForm):
    nullable_fields = ('color', 'description')


-class RackTypeBulkEditForm(PrimaryModelBulkEditForm):
+class RackTypeBulkEditForm(NetBoxModelBulkEditForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -281,6 +310,12 @@ class RackTypeBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = RackType
    fieldsets = (
@@ -299,7 +334,7 @@ class RackTypeBulkEditForm(PrimaryModelBulkEditForm):
    )


-class RackBulkEditForm(PrimaryModelBulkEditForm):
+class RackBulkEditForm(NetBoxModelBulkEditForm):
    region = DynamicModelChoiceField(
        label=_('Region'),
        queryset=Region.objects.all(),
@@ -429,6 +464,12 @@ class RackBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Rack
    fieldsets = (
@@ -444,7 +485,7 @@ class RackBulkEditForm(PrimaryModelBulkEditForm):
    )


-class RackReservationBulkEditForm(PrimaryModelBulkEditForm):
+class RackReservationBulkEditForm(NetBoxModelBulkEditForm):
    status = forms.ChoiceField(
        label=_('Status'),
        choices=add_blank_choice(RackReservationStatusChoices),
@@ -461,6 +502,12 @@ class RackReservationBulkEditForm(PrimaryModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = RackReservation
    fieldsets = (
@@ -469,7 +516,13 @@ class RackReservationBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('comments',)


-class ManufacturerBulkEditForm(OrganizationalModelBulkEditForm):
+class ManufacturerBulkEditForm(NetBoxModelBulkEditForm):
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+
    model = Manufacturer
    fieldsets = (
        FieldSet('description'),
@@ -477,7 +530,7 @@ class ManufacturerBulkEditForm(OrganizationalModelBulkEditForm):
    nullable_fields = ('description',)


-class DeviceTypeBulkEditForm(PrimaryModelBulkEditForm):
+class DeviceTypeBulkEditForm(NetBoxModelBulkEditForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -523,6 +576,12 @@ class DeviceTypeBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = DeviceType
    fieldsets = (
@@ -535,11 +594,17 @@ class DeviceTypeBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('part_number', 'airflow', 'weight', 'weight_unit', 'description', 'comments')


-class ModuleTypeProfileBulkEditForm(PrimaryModelBulkEditForm):
+class ModuleTypeProfileBulkEditForm(NetBoxModelBulkEditForm):
    schema = JSONField(
        label=_('Schema'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = ModuleTypeProfile
    fieldsets = (
@@ -548,7 +613,7 @@ class ModuleTypeProfileBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('description', 'comments')


-class ModuleTypeBulkEditForm(PrimaryModelBulkEditForm):
+class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm):
    profile = DynamicModelChoiceField(
        label=_('Profile'),
        queryset=ModuleTypeProfile.objects.all(),
@@ -579,6 +644,12 @@ class ModuleTypeBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = ModuleType
    fieldsets = (
@@ -592,7 +663,7 @@ class ModuleTypeBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('part_number', 'weight', 'weight_unit', 'profile', 'description', 'comments')


-class DeviceRoleBulkEditForm(NestedGroupModelBulkEditForm):
+class DeviceRoleBulkEditForm(NetBoxModelBulkEditForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=DeviceRole.objects.all(),
@@ -612,6 +683,12 @@ class DeviceRoleBulkEditForm(NestedGroupModelBulkEditForm):
        queryset=ConfigTemplate.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = DeviceRole
    fieldsets = (
@@ -620,7 +697,7 @@ class DeviceRoleBulkEditForm(NestedGroupModelBulkEditForm):
    nullable_fields = ('parent', 'color', 'config_template', 'description', 'comments')


-class PlatformBulkEditForm(NestedGroupModelBulkEditForm):
+class PlatformBulkEditForm(NetBoxModelBulkEditForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=Platform.objects.all(),
@@ -636,6 +713,12 @@ class PlatformBulkEditForm(NestedGroupModelBulkEditForm):
        queryset=ConfigTemplate.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Platform
    fieldsets = (
@@ -644,7 +727,7 @@ class PlatformBulkEditForm(NestedGroupModelBulkEditForm):
    nullable_fields = ('parent', 'manufacturer', 'config_template', 'description', 'comments')


-class DeviceBulkEditForm(PrimaryModelBulkEditForm):
+class DeviceBulkEditForm(NetBoxModelBulkEditForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -704,6 +787,11 @@ class DeviceBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        label=_('Serial Number')
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
    config_template = DynamicModelChoiceField(
        label=_('Config template'),
        queryset=ConfigTemplate.objects.all(),
@@ -717,6 +805,7 @@ class DeviceBulkEditForm(PrimaryModelBulkEditForm):
            'site_id': ['$site', 'null']
        },
    )
+    comments = CommentField()

    model = Device
    fieldsets = (
@@ -731,7 +820,7 @@ class DeviceBulkEditForm(PrimaryModelBulkEditForm):
    )


-class ModuleBulkEditForm(PrimaryModelBulkEditForm):
+class ModuleBulkEditForm(NetBoxModelBulkEditForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -759,6 +848,12 @@ class ModuleBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        label=_('Serial Number')
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Module
    fieldsets = (
@@ -767,7 +862,7 @@ class ModuleBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('serial', 'description', 'comments')


-class CableBulkEditForm(PrimaryModelBulkEditForm):
+class CableBulkEditForm(NetBoxModelBulkEditForm):
    type = forms.ChoiceField(
        label=_('Type'),
        choices=add_blank_choice(CableTypeChoices),
@@ -780,12 +875,6 @@ class CableBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
-    profile = forms.ChoiceField(
-        label=_('Profile'),
-        choices=add_blank_choice(CableProfileChoices),
-        required=False,
-        initial=''
-    )
    tenant = DynamicModelChoiceField(
        label=_('Tenant'),
        queryset=Tenant.objects.all(),
@@ -811,23 +900,35 @@ class CableBulkEditForm(PrimaryModelBulkEditForm):
        required=False,
        initial=''
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = Cable
    fieldsets = (
-        FieldSet('type', 'status', 'profile', 'tenant', 'label', 'description'),
+        FieldSet('type', 'status', 'tenant', 'label', 'description'),
        FieldSet('color', 'length', 'length_unit', name=_('Attributes')),
    )
    nullable_fields = (
-        'type', 'status', 'profile', 'tenant', 'label', 'color', 'length', 'description', 'comments',
+        'type', 'status', 'tenant', 'label', 'color', 'length', 'description', 'comments',
    )


-class VirtualChassisBulkEditForm(PrimaryModelBulkEditForm):
+class VirtualChassisBulkEditForm(NetBoxModelBulkEditForm):
    domain = forms.CharField(
        label=_('Domain'),
        max_length=30,
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = VirtualChassis
    fieldsets = (
@@ -836,7 +937,7 @@ class VirtualChassisBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('domain', 'description', 'comments')


-class PowerPanelBulkEditForm(PrimaryModelBulkEditForm):
+class PowerPanelBulkEditForm(NetBoxModelBulkEditForm):
    region = DynamicModelChoiceField(
        label=_('Region'),
        queryset=Region.objects.all(),
@@ -870,6 +971,12 @@ class PowerPanelBulkEditForm(PrimaryModelBulkEditForm):
            'site_id': '$site'
        }
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = PowerPanel
    fieldsets = (
@@ -878,7 +985,7 @@ class PowerPanelBulkEditForm(PrimaryModelBulkEditForm):
    nullable_fields = ('location', 'description', 'comments')


-class PowerFeedBulkEditForm(PrimaryModelBulkEditForm):
+class PowerFeedBulkEditForm(NetBoxModelBulkEditForm):
    power_panel = DynamicModelChoiceField(
        label=_('Power panel'),
        queryset=PowerPanel.objects.all(),
@@ -934,6 +1041,12 @@ class PowerFeedBulkEditForm(PrimaryModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()

    model = PowerFeed
    fieldsets = (
@@ -1256,7 +1369,7 @@ class InventoryItemTemplateBulkEditForm(ComponentTemplateBulkEditForm):
 # Device components
 #

-class ComponentBulkEditForm(OwnerMixin, NetBoxModelBulkEditForm):
+class ComponentBulkEditForm(NetBoxModelBulkEditForm):
    device = forms.ModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1709,11 +1822,16 @@ class InventoryItemBulkEditForm(
 # Device component roles
 #

-class InventoryItemRoleBulkEditForm(OrganizationalModelBulkEditForm):
+class InventoryItemRoleBulkEditForm(NetBoxModelBulkEditForm):
    color = ColorField(
        label=_('Color'),
        required=False
    )
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )

    model = InventoryItemRole
    fieldsets = (
@@ -1722,7 +1840,7 @@ class InventoryItemRoleBulkEditForm(OrganizationalModelBulkEditForm):
    nullable_fields = ('color', 'description')


-class VirtualDeviceContextBulkEditForm(PrimaryModelBulkEditForm):
+class VirtualDeviceContextBulkEditForm(NetBoxModelBulkEditForm):
    device = DynamicModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1738,7 +1856,6 @@ class VirtualDeviceContextBulkEditForm(PrimaryModelBulkEditForm):
        queryset=Tenant.objects.all(),
        required=False
    )
-
    model = VirtualDeviceContext
    fieldsets = (
        FieldSet('device', 'status', 'tenant'),
@@ -1750,7 +1867,14 @@ class VirtualDeviceContextBulkEditForm(PrimaryModelBulkEditForm):
 # Addressing
 #

-class MACAddressBulkEditForm(PrimaryModelBulkEditForm):
+class MACAddressBulkEditForm(NetBoxModelBulkEditForm):
+    description = forms.CharField(
+        label=_('Description'),
+        max_length=200,
+        required=False
+    )
+    comments = CommentField()
+
    model = MACAddress
    fieldsets = (
        FieldSet('description'),
--- a/netbox/dcim/forms/bulk_import.py
+++ b/netbox/dcim/forms/bulk_import.py
@@ -9,19 +9,15 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.models import *
 from extras.models import ConfigTemplate
-from ipam.choices import VLANQinQRoleChoices
-from ipam.models import VLAN, VRF, IPAddress, VLANGroup
+from ipam.models import VRF, IPAddress
 from netbox.choices import *
-from netbox.forms import (
-    NestedGroupModelImportForm, NetBoxModelImportForm, OrganizationalModelImportForm, OwnerCSVMixin,
-    PrimaryModelImportForm,
-)
+from netbox.forms import NetBoxModelImportForm
 from tenancy.models import Tenant
 from utilities.forms.fields import (
    CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, CSVTypedChoiceField,
    SlugField,
 )
-from virtualization.models import Cluster, VirtualMachine, VMInterface
+from virtualization.models import Cluster, VMInterface, VirtualMachine
 from wireless.choices import WirelessRoleChoices
 from .common import ModuleCommonForm

@@ -62,7 +58,7 @@ __all__ = (
 )


-class RegionImportForm(NestedGroupModelImportForm):
+class RegionImportForm(NetBoxModelImportForm):
    parent = CSVModelChoiceField(
        label=_('Parent'),
        queryset=Region.objects.all(),
@@ -73,10 +69,10 @@ class RegionImportForm(NestedGroupModelImportForm):

    class Meta:
        model = Region
-        fields = ('name', 'slug', 'parent', 'description', 'owner', 'comments', 'tags')
+        fields = ('name', 'slug', 'parent', 'description', 'tags', 'comments')


-class SiteGroupImportForm(NestedGroupModelImportForm):
+class SiteGroupImportForm(NetBoxModelImportForm):
    parent = CSVModelChoiceField(
        label=_('Parent'),
        queryset=SiteGroup.objects.all(),
@@ -87,10 +83,10 @@ class SiteGroupImportForm(NestedGroupModelImportForm):

    class Meta:
        model = SiteGroup
-        fields = ('name', 'slug', 'parent', 'description', 'owner', 'comments', 'tags')
+        fields = ('name', 'slug', 'parent', 'description', 'comments', 'tags')


-class SiteImportForm(PrimaryModelImportForm):
+class SiteImportForm(NetBoxModelImportForm):
    status = CSVChoiceField(
        label=_('Status'),
        choices=SiteStatusChoices,
@@ -122,7 +118,7 @@ class SiteImportForm(PrimaryModelImportForm):
        model = Site
        fields = (
            'name', 'slug', 'status', 'region', 'group', 'tenant', 'facility', 'time_zone', 'description',
-            'physical_address', 'shipping_address', 'latitude', 'longitude', 'owner', 'comments', 'tags'
+            'physical_address', 'shipping_address', 'latitude', 'longitude', 'comments', 'tags'
        )
        help_texts = {
            'time_zone': mark_safe(
@@ -133,7 +129,7 @@ class SiteImportForm(PrimaryModelImportForm):
        }


-class LocationImportForm(NestedGroupModelImportForm):
+class LocationImportForm(NetBoxModelImportForm):
    site = CSVModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -166,8 +162,8 @@ class LocationImportForm(NestedGroupModelImportForm):
    class Meta:
        model = Location
        fields = (
-            'site', 'parent', 'name', 'slug', 'status', 'tenant', 'facility', 'description', 'owner', 'comments',
-            'tags',
+            'site', 'parent', 'name', 'slug', 'status', 'tenant', 'facility', 'description',
+            'tags', 'comments',
        )

    def __init__(self, data=None, *args, **kwargs):
@@ -179,14 +175,15 @@ class LocationImportForm(NestedGroupModelImportForm):
            self.fields['parent'].queryset = self.fields['parent'].queryset.filter(**params)


-class RackRoleImportForm(OrganizationalModelImportForm):
+class RackRoleImportForm(NetBoxModelImportForm):
+    slug = SlugField()

    class Meta:
        model = RackRole
-        fields = ('name', 'slug', 'color', 'description', 'owner', 'tags')
+        fields = ('name', 'slug', 'color', 'description', 'tags')


-class RackTypeImportForm(PrimaryModelImportForm):
+class RackTypeImportForm(NetBoxModelImportForm):
    manufacturer = forms.ModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -227,14 +224,14 @@ class RackTypeImportForm(PrimaryModelImportForm):
        fields = (
            'manufacturer', 'model', 'slug', 'form_factor', 'width', 'u_height', 'starting_unit', 'desc_units',
            'outer_width', 'outer_height', 'outer_depth', 'outer_unit', 'mounting_depth', 'weight', 'max_weight',
-            'weight_unit', 'description', 'owner', 'comments', 'tags',
+            'weight_unit', 'description', 'comments', 'tags',
        )

    def __init__(self, data=None, *args, **kwargs):
        super().__init__(data, *args, **kwargs)


-class RackImportForm(PrimaryModelImportForm):
+class RackImportForm(NetBoxModelImportForm):
    site = CSVModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -312,8 +309,7 @@ class RackImportForm(PrimaryModelImportForm):
        fields = (
            'site', 'location', 'name', 'facility_id', 'tenant', 'status', 'role', 'rack_type', 'form_factor', 'serial',
            'asset_tag', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_height', 'outer_depth', 'outer_unit',
-            'mounting_depth', 'airflow', 'weight', 'max_weight', 'weight_unit', 'description', 'owner', 'comments',
-            'tags',
+            'mounting_depth', 'airflow', 'weight', 'max_weight', 'weight_unit', 'description', 'comments', 'tags',
        )

    def __init__(self, data=None, *args, **kwargs):
@@ -336,7 +332,7 @@ class RackImportForm(PrimaryModelImportForm):
                raise forms.ValidationError(_("U height must be set if not specifying a rack type."))


-class RackReservationImportForm(PrimaryModelImportForm):
+class RackReservationImportForm(NetBoxModelImportForm):
    site = CSVModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -377,7 +373,7 @@ class RackReservationImportForm(PrimaryModelImportForm):

    class Meta:
        model = RackReservation
-        fields = ('site', 'location', 'rack', 'units', 'status', 'tenant', 'description', 'owner', 'comments', 'tags')
+        fields = ('site', 'location', 'rack', 'units', 'status', 'tenant', 'description', 'comments', 'tags')

    def __init__(self, data=None, *args, **kwargs):
        super().__init__(data, *args, **kwargs)
@@ -396,14 +392,14 @@ class RackReservationImportForm(PrimaryModelImportForm):
            self.fields['rack'].queryset = self.fields['rack'].queryset.filter(**params)


-class ManufacturerImportForm(OrganizationalModelImportForm):
+class ManufacturerImportForm(NetBoxModelImportForm):

    class Meta:
        model = Manufacturer
-        fields = ('name', 'slug', 'description', 'owner', 'tags')
+        fields = ('name', 'slug', 'description', 'tags')


-class DeviceTypeImportForm(PrimaryModelImportForm):
+class DeviceTypeImportForm(NetBoxModelImportForm):
    manufacturer = CSVModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -433,21 +429,20 @@ class DeviceTypeImportForm(PrimaryModelImportForm):
        model = DeviceType
        fields = [
            'manufacturer', 'default_platform', 'model', 'slug', 'part_number', 'u_height', 'exclude_from_utilization',
-            'is_full_depth', 'subdevice_role', 'airflow', 'description', 'weight', 'weight_unit', 'owner', 'comments',
-            'tags',
+            'is_full_depth', 'subdevice_role', 'airflow', 'description', 'weight', 'weight_unit', 'comments', 'tags',
        ]


-class ModuleTypeProfileImportForm(PrimaryModelImportForm):
+class ModuleTypeProfileImportForm(NetBoxModelImportForm):

    class Meta:
        model = ModuleTypeProfile
        fields = [
-            'name', 'description', 'schema', 'owner', 'comments', 'tags',
+            'name', 'description', 'schema', 'comments', 'tags',
        ]


-class ModuleTypeImportForm(PrimaryModelImportForm):
+class ModuleTypeImportForm(NetBoxModelImportForm):
    profile = forms.ModelChoiceField(
        label=_('Profile'),
        queryset=ModuleTypeProfile.objects.all(),
@@ -481,11 +476,11 @@ class ModuleTypeImportForm(PrimaryModelImportForm):
        model = ModuleType
        fields = [
            'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'profile',
-            'owner', 'comments', 'tags'
+            'comments', 'tags'
        ]


-class DeviceRoleImportForm(NestedGroupModelImportForm):
+class DeviceRoleImportForm(NetBoxModelImportForm):
    parent = CSVModelChoiceField(
        label=_('Parent'),
        queryset=DeviceRole.objects.all(),
@@ -503,15 +498,17 @@ class DeviceRoleImportForm(NestedGroupModelImportForm):
        required=False,
        help_text=_('Config template')
    )
+    slug = SlugField()

    class Meta:
        model = DeviceRole
        fields = (
-            'name', 'slug', 'parent', 'color', 'vm_role', 'config_template', 'description', 'owner', 'comments', 'tags'
+            'name', 'slug', 'parent', 'color', 'vm_role', 'config_template', 'description', 'comments', 'tags'
        )


-class PlatformImportForm(NestedGroupModelImportForm):
+class PlatformImportForm(NetBoxModelImportForm):
+    slug = SlugField()
    parent = CSVModelChoiceField(
        label=_('Parent'),
        queryset=Platform.objects.all(),
@@ -540,11 +537,11 @@ class PlatformImportForm(NestedGroupModelImportForm):
    class Meta:
        model = Platform
        fields = (
-            'name', 'slug', 'parent', 'manufacturer', 'config_template', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'parent', 'manufacturer', 'config_template', 'description', 'tags',
        )


-class BaseDeviceImportForm(PrimaryModelImportForm):
+class BaseDeviceImportForm(NetBoxModelImportForm):
    role = CSVModelChoiceField(
        label=_('Device role'),
        queryset=DeviceRole.objects.all(),
@@ -670,8 +667,8 @@ class DeviceImportForm(BaseDeviceImportForm):
        fields = [
            'name', 'role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status',
            'site', 'location', 'rack', 'position', 'face', 'latitude', 'longitude', 'parent', 'device_bay', 'airflow',
-            'virtual_chassis', 'vc_position', 'vc_priority', 'cluster', 'description', 'config_template', 'owner',
-            'comments', 'tags',
+            'virtual_chassis', 'vc_position', 'vc_priority', 'cluster', 'description', 'config_template', 'comments',
+            'tags',
        ]

    def __init__(self, data=None, *args, **kwargs):
@@ -718,7 +715,7 @@ class DeviceImportForm(BaseDeviceImportForm):
            self.instance.parent_bay = device_bay


-class ModuleImportForm(ModuleCommonForm, PrimaryModelImportForm):
+class ModuleImportForm(ModuleCommonForm, NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -756,7 +753,7 @@ class ModuleImportForm(ModuleCommonForm, PrimaryModelImportForm):
    class Meta:
        model = Module
        fields = (
-            'device', 'module_bay', 'module_type', 'serial', 'asset_tag', 'status', 'description', 'owner', 'comments',
+            'device', 'module_bay', 'module_type', 'serial', 'asset_tag', 'status', 'description', 'comments',
            'replicate_components', 'adopt_components', 'tags',
        )

@@ -780,7 +777,7 @@ class ModuleImportForm(ModuleCommonForm, PrimaryModelImportForm):
 # Device components
 #

-class ConsolePortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class ConsolePortImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -803,10 +800,10 @@ class ConsolePortImportForm(OwnerCSVMixin, NetBoxModelImportForm):

    class Meta:
        model = ConsolePort
-        fields = ('device', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'owner', 'tags')
+        fields = ('device', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'tags')


-class ConsoleServerPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class ConsoleServerPortImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -829,10 +826,10 @@ class ConsoleServerPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):

    class Meta:
        model = ConsoleServerPort
-        fields = ('device', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'owner', 'tags')
+        fields = ('device', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'tags')


-class PowerPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class PowerPortImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -848,12 +845,11 @@ class PowerPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
    class Meta:
        model = PowerPort
        fields = (
-            'device', 'name', 'label', 'type', 'mark_connected', 'maximum_draw', 'allocated_draw', 'description',
-            'owner', 'tags',
+            'device', 'name', 'label', 'type', 'mark_connected', 'maximum_draw', 'allocated_draw', 'description', 'tags'
        )


-class PowerOutletImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class PowerOutletImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -883,7 +879,7 @@ class PowerOutletImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        model = PowerOutlet
        fields = (
            'device', 'name', 'label', 'type', 'color', 'mark_connected', 'power_port', 'feed_leg', 'description',
-            'owner', 'tags',
+            'tags',
        )

    def __init__(self, *args, **kwargs):
@@ -909,7 +905,7 @@ class PowerOutletImportForm(OwnerCSVMixin, NetBoxModelImportForm):
            self.fields['power_port'].queryset = PowerPort.objects.none()


-class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class InterfaceImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -942,7 +938,7 @@ class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        required=False,
        to_field_name='name',
        help_text=mark_safe(
-            _('VDC names separated by commas, encased with double quotes. Example:') + ' <code>"vdc1,vdc2,vdc3"</code>'
+            _('VDC names separated by commas, encased with double quotes. Example:') + ' <code>vdc1,vdc2,vdc3</code>'
        )
    )
    type = CSVChoiceField(
@@ -971,41 +967,7 @@ class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        label=_('Mode'),
        choices=InterfaceModeChoices,
        required=False,
-        help_text=_('IEEE 802.1Q operational mode (for L2 interfaces)'),
-    )
-    vlan_group = CSVModelChoiceField(
-        label=_('VLAN group'),
-        queryset=VLANGroup.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text=_('Filter VLANs available for assignment by group'),
-    )
-    untagged_vlan = CSVModelChoiceField(
-        label=_('Untagged VLAN'),
-        queryset=VLAN.objects.all(),
-        required=False,
-        to_field_name='vid',
-        help_text=_('Assigned untagged VLAN ID (filtered by VLAN group)'),
-    )
-    tagged_vlans = CSVModelMultipleChoiceField(
-        label=_('Tagged VLANs'),
-        queryset=VLAN.objects.all(),
-        required=False,
-        to_field_name='vid',
-        help_text=mark_safe(
-            _(
-                'Assigned tagged VLAN IDs separated by commas, encased with double quotes '
-                '(filtered by VLAN group). Example:'
-            )
-            + ' <code>"100,200,300"</code>'
-        ),
-    )
-    qinq_svlan = CSVModelChoiceField(
-        label=_('Q-in-Q Service VLAN'),
-        queryset=VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE),
-        required=False,
-        to_field_name='vid',
-        help_text=_('Assigned Q-in-Q Service VLAN ID (filtered by VLAN group)'),
+        help_text=_('IEEE 802.1Q operational mode (for L2 interfaces)')
    )
    vrf = CSVModelChoiceField(
        label=_('VRF'),
@@ -1026,8 +988,7 @@ class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        fields = (
            'device', 'name', 'label', 'parent', 'bridge', 'lag', 'type', 'speed', 'duplex', 'enabled',
            'mark_connected', 'wwn', 'vdcs', 'mtu', 'mgmt_only', 'description', 'poe_mode', 'poe_type', 'mode',
-            'vlan_group', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vrf', 'rf_role', 'rf_channel',
-            'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'owner', 'tags'
+            'vrf', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'tags'
        )

    def __init__(self, data=None, *args, **kwargs):
@@ -1044,13 +1005,6 @@ class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
                self.fields['lag'].queryset = self.fields['lag'].queryset.filter(**params)
                self.fields['vdcs'].queryset = self.fields['vdcs'].queryset.filter(**params)

-            # Limit choices for VLANs to the assigned VLAN group
-            if vlan_group := data.get('vlan_group'):
-                params = {f"group__{self.fields['vlan_group'].to_field_name}": vlan_group}
-                self.fields['untagged_vlan'].queryset = self.fields['untagged_vlan'].queryset.filter(**params)
-                self.fields['tagged_vlans'].queryset = self.fields['tagged_vlans'].queryset.filter(**params)
-                self.fields['qinq_svlan'].queryset = self.fields['qinq_svlan'].queryset.filter(**params)
-
    def clean_enabled(self):
        # Make sure enabled is True when it's not included in the uploaded data
        if 'enabled' not in self.data:
@@ -1069,12 +1023,18 @@ class InterfaceImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        return self.cleaned_data['vdcs']


-class FrontPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class FrontPortImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
        to_field_name='name'
    )
+    rear_port = CSVModelChoiceField(
+        label=_('Rear port'),
+        queryset=RearPort.objects.all(),
+        to_field_name='name',
+        help_text=_('Corresponding rear port')
+    )
    type = CSVChoiceField(
        label=_('Type'),
        choices=PortTypeChoices,
@@ -1084,11 +1044,34 @@ class FrontPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
    class Meta:
        model = FrontPort
        fields = (
-            'device', 'name', 'label', 'type', 'color', 'mark_connected', 'positions', 'description', 'owner', 'tags'
+            'device', 'name', 'label', 'type', 'color', 'mark_connected', 'rear_port', 'rear_port_position',
+            'description', 'tags'
        )

+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)

-class RearPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+        # Limit RearPort choices to those belonging to this device (or VC master)
+        if self.is_bound and 'device' in self.data:
+            try:
+                device = self.fields['device'].to_python(self.data['device'])
+            except forms.ValidationError:
+                device = None
+        else:
+            try:
+                device = self.instance.device
+            except Device.DoesNotExist:
+                device = None
+
+        if device:
+            self.fields['rear_port'].queryset = RearPort.objects.filter(
+                device__in=[device, device.get_vc_master()]
+            )
+        else:
+            self.fields['rear_port'].queryset = RearPort.objects.none()
+
+
+class RearPortImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1102,12 +1085,10 @@ class RearPortImportForm(OwnerCSVMixin, NetBoxModelImportForm):

    class Meta:
        model = RearPort
-        fields = (
-            'device', 'name', 'label', 'type', 'color', 'mark_connected', 'positions', 'description', 'owner', 'tags',
-        )
+        fields = ('device', 'name', 'label', 'type', 'color', 'mark_connected', 'positions', 'description', 'tags')


-class ModuleBayImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class ModuleBayImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1116,10 +1097,10 @@ class ModuleBayImportForm(OwnerCSVMixin, NetBoxModelImportForm):

    class Meta:
        model = ModuleBay
-        fields = ('device', 'name', 'label', 'position', 'description', 'owner', 'tags')
+        fields = ('device', 'name', 'label', 'position', 'description', 'tags')


-class DeviceBayImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class DeviceBayImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1138,7 +1119,7 @@ class DeviceBayImportForm(OwnerCSVMixin, NetBoxModelImportForm):

    class Meta:
        model = DeviceBay
-        fields = ('device', 'name', 'label', 'installed_device', 'description', 'owner', 'tags')
+        fields = ('device', 'name', 'label', 'installed_device', 'description', 'tags')

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
@@ -1167,7 +1148,7 @@ class DeviceBayImportForm(OwnerCSVMixin, NetBoxModelImportForm):
            self.fields['installed_device'].queryset = Device.objects.none()


-class InventoryItemImportForm(OwnerCSVMixin, NetBoxModelImportForm):
+class InventoryItemImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1214,7 +1195,7 @@ class InventoryItemImportForm(OwnerCSVMixin, NetBoxModelImportForm):
        model = InventoryItem
        fields = (
            'device', 'name', 'label', 'status', 'role', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag',
-            'discovered', 'description', 'owner', 'tags', 'component_type', 'component_name',
+            'discovered', 'description', 'tags', 'component_type', 'component_name',
        )

    def __init__(self, *args, **kwargs):
@@ -1277,7 +1258,7 @@ class InventoryItemImportForm(OwnerCSVMixin, NetBoxModelImportForm):
 # Device component roles
 #

-class InventoryItemRoleImportForm(OrganizationalModelImportForm):
+class InventoryItemRoleImportForm(NetBoxModelImportForm):
    slug = SlugField()

    class Meta:
@@ -1289,7 +1270,7 @@ class InventoryItemRoleImportForm(OrganizationalModelImportForm):
 # Addressing
 #

-class MACAddressImportForm(PrimaryModelImportForm):
+class MACAddressImportForm(NetBoxModelImportForm):
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1320,8 +1301,7 @@ class MACAddressImportForm(PrimaryModelImportForm):
    class Meta:
        model = MACAddress
        fields = [
-            'mac_address', 'device', 'virtual_machine', 'interface', 'is_primary', 'description', 'owner', 'comments',
-            'tags',
+            'mac_address', 'device', 'virtual_machine', 'interface', 'is_primary', 'description', 'comments', 'tags',
        ]

    def __init__(self, data=None, *args, **kwargs):
@@ -1374,7 +1354,7 @@ class MACAddressImportForm(PrimaryModelImportForm):
 # Cables
 #

-class CableImportForm(PrimaryModelImportForm):
+class CableImportForm(NetBoxModelImportForm):
    # Termination A
    side_a_site = CSVModelChoiceField(
        label=_('Side A site'),
@@ -1432,12 +1412,6 @@ class CableImportForm(PrimaryModelImportForm):
        required=False,
        help_text=_('Connection status')
    )
-    profile = CSVChoiceField(
-        label=_('Profile'),
-        choices=CableProfileChoices,
-        required=False,
-        help_text=_('Cable connection profile')
-    )
    type = CSVChoiceField(
        label=_('Type'),
        choices=CableTypeChoices,
@@ -1468,8 +1442,8 @@ class CableImportForm(PrimaryModelImportForm):
        model = Cable
        fields = [
            'side_a_site', 'side_a_device', 'side_a_type', 'side_a_name', 'side_b_site', 'side_b_device', 'side_b_type',
-            'side_b_name', 'type', 'status', 'profile', 'tenant', 'label', 'color', 'length', 'length_unit',
-            'description', 'owner', 'comments', 'tags',
+            'side_b_name', 'type', 'status', 'tenant', 'label', 'color', 'length', 'length_unit', 'description',
+            'comments', 'tags',
        ]

    def __init__(self, data=None, *args, **kwargs):
@@ -1563,7 +1537,7 @@ class CableImportForm(PrimaryModelImportForm):
 #


-class VirtualChassisImportForm(PrimaryModelImportForm):
+class VirtualChassisImportForm(NetBoxModelImportForm):
    master = CSVModelChoiceField(
        label=_('Master'),
        queryset=Device.objects.all(),
@@ -1574,14 +1548,14 @@ class VirtualChassisImportForm(PrimaryModelImportForm):

    class Meta:
        model = VirtualChassis
-        fields = ('name', 'domain', 'master', 'description', 'owner', 'comments', 'tags')
+        fields = ('name', 'domain', 'master', 'description', 'comments', 'tags')


 #
 # Power
 #

-class PowerPanelImportForm(PrimaryModelImportForm):
+class PowerPanelImportForm(NetBoxModelImportForm):
    site = CSVModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -1597,7 +1571,7 @@ class PowerPanelImportForm(PrimaryModelImportForm):

    class Meta:
        model = PowerPanel
-        fields = ('site', 'location', 'name', 'description', 'owner', 'comments', 'tags')
+        fields = ('site', 'location', 'name', 'description', 'comments', 'tags')

    def __init__(self, data=None, *args, **kwargs):
        super().__init__(data, *args, **kwargs)
@@ -1609,7 +1583,7 @@ class PowerPanelImportForm(PrimaryModelImportForm):
            self.fields['location'].queryset = self.fields['location'].queryset.filter(**params)


-class PowerFeedImportForm(PrimaryModelImportForm):
+class PowerFeedImportForm(NetBoxModelImportForm):
    site = CSVModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -1667,7 +1641,7 @@ class PowerFeedImportForm(PrimaryModelImportForm):
        model = PowerFeed
        fields = (
            'site', 'power_panel', 'location', 'rack', 'name', 'status', 'type', 'mark_connected', 'supply', 'phase',
-            'voltage', 'amperage', 'max_utilization', 'tenant', 'description', 'owner', 'comments', 'tags',
+            'voltage', 'amperage', 'max_utilization', 'tenant', 'description', 'comments', 'tags',
        )

    def __init__(self, data=None, *args, **kwargs):
@@ -1691,7 +1665,8 @@ class PowerFeedImportForm(PrimaryModelImportForm):
            self.fields['rack'].queryset = self.fields['rack'].queryset.filter(**params)


-class VirtualDeviceContextImportForm(PrimaryModelImportForm):
+class VirtualDeviceContextImportForm(NetBoxModelImportForm):
+
    device = CSVModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1726,7 +1701,7 @@ class VirtualDeviceContextImportForm(PrimaryModelImportForm):

    class Meta:
        fields = [
-            'name', 'device', 'status', 'tenant', 'identifier', 'owner', 'comments', 'primary_ip4', 'primary_ip6',
+            'name', 'device', 'status', 'tenant', 'identifier', 'comments', 'primary_ip4', 'primary_ip6',
        ]
        model = VirtualDeviceContext

--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -8,14 +8,11 @@ from extras.forms import LocalConfigContextFilterForm
 from extras.models import ConfigTemplate
 from ipam.models import ASN, VRF, VLANTranslationPolicy
 from netbox.choices import *
-from netbox.forms import (
-    NestedGroupModelFilterSetForm, NetBoxModelFilterSetForm, OrganizationalModelFilterSetForm,
-    PrimaryModelFilterSetForm,
-)
+from netbox.forms import NetBoxModelFilterSetForm
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
-from users.models import Owner, User
+from users.models import User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
-from utilities.forms.fields import ColorField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, TagFilterField
+from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import NumberWithOptions
 from virtualization.models import Cluster, ClusterGroup, VirtualMachine
@@ -140,18 +137,12 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
        required=False,
        label=_('Device Status'),
    )
-    owner_id = DynamicModelChoiceField(
-        queryset=Owner.objects.all(),
-        required=False,
-        label=_('Owner'),
-    )


-class RegionFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
+class RegionFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Region
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('parent_id', name=_('Region')),
+        FieldSet('q', 'filter_id', 'tag', 'parent_id'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    parent_id = DynamicModelMultipleChoiceField(
@@ -162,11 +153,10 @@ class RegionFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
    tag = TagFilterField(model)


-class SiteGroupFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
+class SiteGroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = SiteGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('parent_id', name=_('Site Group')),
+        FieldSet('q', 'filter_id', 'tag', 'parent_id'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    parent_id = DynamicModelMultipleChoiceField(
@@ -177,10 +167,10 @@ class SiteGroupFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm)
    tag = TagFilterField(model)


-class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
+class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Site
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('status', 'region_id', 'group_id', 'asn_id', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
@@ -209,10 +199,10 @@ class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilt
    tag = TagFilterField(model)


-class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NestedGroupModelFilterSetForm):
+class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Location
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'parent_id', 'status', 'facility', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
@@ -257,15 +247,12 @@ class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NestedGroupM
    tag = TagFilterField(model)


-class RackRoleFilterForm(OrganizationalModelFilterSetForm):
+class RackRoleFilterForm(NetBoxModelFilterSetForm):
    model = RackRole
-    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-    )
    tag = TagFilterField(model)


-class RackBaseFilterForm(PrimaryModelFilterSetForm):
+class RackBaseFilterForm(NetBoxModelFilterSetForm):
    form_factor = forms.MultipleChoiceField(
        label=_('Form factor'),
        choices=RackFormFactorChoices,
@@ -291,6 +278,11 @@ class RackBaseFilterForm(PrimaryModelFilterSetForm):
            choices=BOOLEAN_WITH_BLANK_CHOICES
        )
    )
+    airflow = forms.MultipleChoiceField(
+        label=_('Airflow'),
+        choices=add_blank_choice(RackAirflowChoices),
+        required=False
+    )
    weight = forms.DecimalField(
        label=_('Weight'),
        required=False,
@@ -311,8 +303,8 @@ class RackBaseFilterForm(PrimaryModelFilterSetForm):
 class RackTypeFilterForm(RackBaseFilterForm):
    model = RackType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('manufacturer_id', 'form_factor', 'width', 'u_height', 'rack_count', name=_('Rack Type')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('manufacturer_id', 'form_factor', 'width', 'u_height', name=_('Rack Type')),
        FieldSet('starting_unit', 'desc_units', name=_('Numbering')),
        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
    )
@@ -322,18 +314,13 @@ class RackTypeFilterForm(RackBaseFilterForm):
        required=False,
        label=_('Manufacturer')
    )
-    rack_count = forms.IntegerField(
-        label=_('Rack count'),
-        required=False,
-        min_value=0,
-    )
    tag = TagFilterField(model)


 class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, RackBaseFilterForm):
    model = Rack
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
        FieldSet('status', 'role_id', 'manufacturer_id', 'rack_type_id', 'serial', 'asset_tag', name=_('Rack')),
@@ -394,11 +381,6 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, RackBaseFilterFo
        },
        label=_('Rack type')
    )
-    airflow = forms.MultipleChoiceField(
-        label=_('Airflow'),
-        choices=add_blank_choice(RackAirflowChoices),
-        required=False
-    )
    serial = forms.CharField(
        label=_('Serial'),
        required=False
@@ -431,10 +413,10 @@ class RackElevationFilterForm(RackFilterForm):
    )


-class RackReservationFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
+class RackReservationFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = RackReservation
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('status', 'user_id', name=_('Reservation')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Rack')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
@@ -489,22 +471,21 @@ class RackReservationFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class ManufacturerFilterForm(ContactModelFilterForm, OrganizationalModelFilterSetForm):
+class ManufacturerFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = Manufacturer
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    tag = TagFilterField(model)


-class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
+class DeviceTypeFilterForm(NetBoxModelFilterSetForm):
    model = DeviceType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet(
-            'manufacturer_id', 'default_platform_id', 'part_number', 'device_count',
-            'subdevice_role', 'airflow', name=_('Hardware')
+            'manufacturer_id', 'default_platform_id', 'part_number', 'subdevice_role', 'airflow', name=_('Hardware')
        ),
        FieldSet('has_front_image', 'has_rear_image', name=_('Images')),
        FieldSet(
@@ -528,11 +509,6 @@ class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
        label=_('Part number'),
        required=False
    )
-    device_count = forms.IntegerField(
-        label=_('Device count'),
-        required=False,
-        min_value=0,
-    )
    subdevice_role = forms.MultipleChoiceField(
        label=_('Subdevice role'),
        choices=add_blank_choice(SubdeviceRoleChoices),
@@ -632,22 +608,19 @@ class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
    )


-class ModuleTypeProfileFilterForm(PrimaryModelFilterSetForm):
+class ModuleTypeProfileFilterForm(NetBoxModelFilterSetForm):
    model = ModuleTypeProfile
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
    )
    selector_fields = ('filter_id', 'q')


-class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
+class ModuleTypeFilterForm(NetBoxModelFilterSetForm):
    model = ModuleType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet(
-            'profile_id', 'manufacturer_id', 'part_number', 'module_count',
-            'airflow', name=_('Hardware')
-        ),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('profile_id', 'manufacturer_id', 'part_number', 'airflow', name=_('Hardware')),
        FieldSet(
            'console_ports', 'console_server_ports', 'power_ports', 'power_outlets', 'interfaces',
            'pass_through_ports', name=_('Components')
@@ -669,11 +642,6 @@ class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
        label=_('Part number'),
        required=False
    )
-    module_count = forms.IntegerField(
-        label=_('Module count'),
-        required=False,
-        min_value=0,
-    )
    console_ports = forms.NullBooleanField(
        required=False,
        label=_('Has console ports'),
@@ -733,12 +701,8 @@ class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
    )


-class DeviceRoleFilterForm(NestedGroupModelFilterSetForm):
+class DeviceRoleFilterForm(NetBoxModelFilterSetForm):
    model = DeviceRole
-    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('parent_id', 'config_template_id', name=_('Device Role'))
-    )
    config_template_id = DynamicModelMultipleChoiceField(
        queryset=ConfigTemplate.objects.all(),
        required=False,
@@ -752,12 +716,8 @@ class DeviceRoleFilterForm(NestedGroupModelFilterSetForm):
    tag = TagFilterField(model)


-class PlatformFilterForm(NestedGroupModelFilterSetForm):
+class PlatformFilterForm(NetBoxModelFilterSetForm):
    model = Platform
-    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('manufacturer_id', 'parent_id', 'config_template_id', name=_('Platform'))
-    )
    selector_fields = ('filter_id', 'q', 'manufacturer_id')
    parent_id = DynamicModelMultipleChoiceField(
        queryset=Platform.objects.all(),
@@ -781,11 +741,11 @@ class DeviceFilterForm(
    LocalConfigContextFilterForm,
    TenancyFilterForm,
    ContactModelFilterForm,
-    PrimaryModelFilterSetForm
+    NetBoxModelFilterSetForm
 ):
    model = Device
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet('status', 'role_id', 'airflow', 'serial', 'asset_tag', 'mac_address', name=_('Operation')),
        FieldSet('manufacturer_id', 'device_type_id', 'platform_id', name=_('Hardware')),
@@ -975,10 +935,13 @@ class DeviceFilterForm(
    tag = TagFilterField(model)


-class VirtualDeviceContextFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
+class VirtualDeviceContextFilterForm(
+    TenancyFilterForm,
+    NetBoxModelFilterSetForm
+):
    model = VirtualDeviceContext
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('device', 'status', 'has_primary_ip', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
    )
@@ -1002,10 +965,10 @@ class VirtualDeviceContextFilterForm(TenancyFilterForm, PrimaryModelFilterSetFor
    tag = TagFilterField(model)


-class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
+class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxModelFilterSetForm):
    model = Module
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'device_id', name=_('Location')),
        FieldSet('manufacturer_id', 'module_type_id', 'status', 'serial', 'asset_tag', name=_('Hardware')),
    )
@@ -1085,10 +1048,10 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, PrimaryM
    tag = TagFilterField(model)


-class VirtualChassisFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
+class VirtualChassisFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = VirtualChassis
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
    )
@@ -1114,12 +1077,12 @@ class VirtualChassisFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class CableFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
+class CableFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = Cable
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('site_id', 'location_id', 'rack_id', 'device_id', name=_('Location')),
-        FieldSet('type', 'status', 'profile', 'color', 'length', 'length_unit', 'unterminated', name=_('Attributes')),
+        FieldSet('type', 'status', 'color', 'length', 'length_unit', 'unterminated', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
    )
    region_id = DynamicModelMultipleChoiceField(
@@ -1175,11 +1138,6 @@ class CableFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
        required=False,
        choices=add_blank_choice(LinkStatusChoices)
    )
-    profile = forms.MultipleChoiceField(
-        label=_('Profile'),
-        required=False,
-        choices=add_blank_choice(CableProfileChoices)
-    )
    color = ColorField(
        label=_('Color'),
        required=False
@@ -1203,10 +1161,10 @@ class CableFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class PowerPanelFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
+class PowerPanelFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
    model = PowerPanel
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
@@ -1242,10 +1200,10 @@ class PowerPanelFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    tag = TagFilterField(model)


-class PowerFeedFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
+class PowerFeedFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
    model = PowerFeed
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'power_panel_id', 'rack_id', name=_('Location')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
        FieldSet('status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', name=_('Attributes')),
@@ -1355,7 +1313,7 @@ class PathEndpointFilterForm(CabledFilterForm):
 class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = ConsolePort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1379,7 +1337,7 @@ class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
 class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = ConsoleServerPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1404,7 +1362,7 @@ class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterF
 class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = PowerPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1423,7 +1381,7 @@ class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
 class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = PowerOutlet
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', 'color', 'status', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1452,7 +1410,7 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
 class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = Interface
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'kind', 'type', 'speed', 'duplex', 'enabled', 'mgmt_only', name=_('Attributes')),
        FieldSet('vrf_id', 'l2vpn_id', 'mac_address', 'wwn', name=_('Addressing')),
        FieldSet('poe_mode', 'poe_type', name=_('PoE')),
@@ -1577,7 +1535,7 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):

 class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1601,7 +1559,7 @@ class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
 class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
    model = RearPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1625,7 +1583,7 @@ class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
 class ModuleBayFilterForm(DeviceComponentFilterForm):
    model = ModuleBay
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', 'position', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1643,7 +1601,7 @@ class ModuleBayFilterForm(DeviceComponentFilterForm):
 class DeviceBayFilterForm(DeviceComponentFilterForm):
    model = DeviceBay
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('name', 'label', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1657,7 +1615,7 @@ class DeviceBayFilterForm(DeviceComponentFilterForm):
 class InventoryItemFilterForm(DeviceComponentFilterForm):
    model = InventoryItem
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('q', 'filter_id', 'tag'),
        FieldSet(
            'name', 'label', 'status', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered',
            name=_('Attributes')
@@ -1705,11 +1663,8 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
 # Device component roles
 #

-class InventoryItemRoleFilterForm(OrganizationalModelFilterSetForm):
+class InventoryItemRoleFilterForm(NetBoxModelFilterSetForm):
    model = InventoryItemRole
-    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-    )
    tag = TagFilterField(model)


@@ -1717,17 +1672,16 @@ class InventoryItemRoleFilterForm(OrganizationalModelFilterSetForm):
 # Addressing
 #

-class MACAddressFilterForm(PrimaryModelFilterSetForm):
+class MACAddressFilterForm(NetBoxModelFilterSetForm):
    model = MACAddress
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
-        FieldSet('mac_address', name=_('Attributes')),
-        FieldSet('device_id', 'virtual_machine_id', 'assigned', 'primary', name=_('Assignments')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('mac_address', 'device_id', 'virtual_machine_id', name=_('MAC address')),
    )
    selector_fields = ('filter_id', 'q', 'device_id', 'virtual_machine_id')
    mac_address = forms.CharField(
        required=False,
-        label=_('MAC address'),
+        label=_('MAC address')
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1739,20 +1693,6 @@ class MACAddressFilterForm(PrimaryModelFilterSetForm):
        required=False,
        label=_('Assigned VM'),
    )
-    assigned = forms.NullBooleanField(
-        required=False,
-        label=_('Assigned to an interface'),
-        widget=forms.Select(
-            choices=BOOLEAN_WITH_BLANK_CHOICES
-        ),
-    )
-    primary = forms.NullBooleanField(
-        required=False,
-        label=_('Primary MAC of an interface'),
-        widget=forms.Select(
-            choices=BOOLEAN_WITH_BLANK_CHOICES
-        ),
-    )
    tag = TagFilterField(model)


--- a/netbox/dcim/forms/mixins.py
+++ b/netbox/dcim/forms/mixins.py
@@ -4,7 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.utils.translation import gettext_lazy as _

 from dcim.constants import LOCATION_SCOPE_TYPES
-from dcim.models import PortMapping, PortTemplateMapping, Site
+from dcim.models import Site
 from utilities.forms import get_field_value
 from utilities.forms.fields import (
    ContentTypeChoiceField, CSVContentTypeField, DynamicModelChoiceField,
@@ -13,7 +13,6 @@ from utilities.templatetags.builtins.filters import bettertitle
 from utilities.forms.widgets import HTMXSelect

 __all__ = (
-    'FrontPortFormMixin',
    'ScopedBulkEditForm',
    'ScopedForm',
    'ScopedImportForm',
@@ -129,56 +128,3 @@ class ScopedImportForm(forms.Form):
                    "Please select a {scope_type}."
                ).format(scope_type=scope_type.model_class()._meta.model_name)
            })
-
-
-class FrontPortFormMixin(forms.Form):
-    rear_ports = forms.MultipleChoiceField(
-        choices=[],
-        label=_('Rear ports'),
-        widget=forms.SelectMultiple(attrs={'size': 8})
-    )
-
-    port_mapping_model = PortMapping
-    parent_field = 'device'
-
-    def clean(self):
-        super().clean()
-
-        # Count of selected rear port & position pairs much match the assigned number of positions
-        if len(self.cleaned_data['rear_ports']) != self.cleaned_data['positions']:
-            raise forms.ValidationError({
-                'rear_ports': _(
-                    "The number of rear port/position pairs selected must match the number of positions assigned."
-                )
-            })
-
-    def _save_m2m(self):
-        super()._save_m2m()
-
-        # TODO: Can this be made more efficient?
-        # Delete existing rear port mappings
-        self.port_mapping_model.objects.filter(front_port_id=self.instance.pk).delete()
-
-        # Create new rear port mappings
-        mappings = []
-        if self.port_mapping_model is PortTemplateMapping:
-            params = {
-                'device_type_id': self.instance.device_type_id,
-                'module_type_id': self.instance.module_type_id,
-            }
-        else:
-            params = {
-                'device_id': self.instance.device_id,
-            }
-        for i, rp_position in enumerate(self.cleaned_data['rear_ports'], start=1):
-            rear_port_id, rear_port_position = rp_position.split(':')
-            mappings.append(
-                self.port_mapping_model(**{
-                    **params,
-                    'front_port_id': self.instance.pk,
-                    'front_port_position': i,
-                    'rear_port_id': rear_port_id,
-                    'rear_port_position': rear_port_position,
-                })
-            )
-        self.port_mapping_model.objects.bulk_create(mappings)
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -6,18 +6,17 @@ from timezone_field import TimeZoneFormField

 from dcim.choices import *
 from dcim.constants import *
-from dcim.forms.mixins import FrontPortFormMixin
 from dcim.models import *
 from extras.models import ConfigTemplate
 from ipam.choices import VLANQinQRoleChoices
 from ipam.models import ASN, IPAddress, VLAN, VLANGroup, VLANTranslationPolicy, VRF
-from netbox.forms import NestedGroupModelForm, NetBoxModelForm, OrganizationalModelForm, PrimaryModelForm
-from netbox.forms.mixins import ChangelogMessageMixin, OwnerMixin
+from netbox.forms import NetBoxModelForm
+from netbox.forms.mixins import ChangelogMessageMixin
 from tenancy.forms import TenancyForm
 from users.models import User
 from utilities.forms import add_blank_choice, get_field_value
 from utilities.forms.fields import (
-    DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField,
+    CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField,
 )
 from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups
 from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK
@@ -76,12 +75,14 @@ __all__ = (
 )


-class RegionForm(NestedGroupModelForm):
+class RegionForm(NetBoxModelForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=Region.objects.all(),
        required=False
    )
+    slug = SlugField()
+    comments = CommentField()

    fieldsets = (
        FieldSet('parent', 'name', 'slug', 'description', 'tags'),
@@ -90,16 +91,18 @@ class RegionForm(NestedGroupModelForm):
    class Meta:
        model = Region
        fields = (
-            'parent', 'name', 'slug', 'description', 'owner', 'tags', 'comments',
+            'parent', 'name', 'slug', 'description', 'tags', 'comments',
        )


-class SiteGroupForm(NestedGroupModelForm):
+class SiteGroupForm(NetBoxModelForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=SiteGroup.objects.all(),
        required=False
    )
+    slug = SlugField()
+    comments = CommentField()

    fieldsets = (
        FieldSet('parent', 'name', 'slug', 'description', 'tags'),
@@ -108,11 +111,11 @@ class SiteGroupForm(NestedGroupModelForm):
    class Meta:
        model = SiteGroup
        fields = (
-            'parent', 'name', 'slug', 'description', 'owner', 'comments', 'tags',
+            'parent', 'name', 'slug', 'description', 'comments', 'tags',
        )


-class SiteForm(TenancyForm, PrimaryModelForm):
+class SiteForm(TenancyForm, NetBoxModelForm):
    region = DynamicModelChoiceField(
        label=_('Region'),
        queryset=Region.objects.all(),
@@ -136,6 +139,7 @@ class SiteForm(TenancyForm, PrimaryModelForm):
        choices=add_blank_choice(TimeZoneFormField().choices),
        required=False
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -150,7 +154,7 @@ class SiteForm(TenancyForm, PrimaryModelForm):
        model = Site
        fields = (
            'name', 'slug', 'status', 'region', 'group', 'tenant_group', 'tenant', 'facility', 'asns', 'time_zone',
-            'description', 'physical_address', 'shipping_address', 'latitude', 'longitude', 'owner', 'comments', 'tags',
+            'description', 'physical_address', 'shipping_address', 'latitude', 'longitude', 'comments', 'tags',
        )
        widgets = {
            'physical_address': forms.Textarea(
@@ -166,7 +170,7 @@ class SiteForm(TenancyForm, PrimaryModelForm):
        }


-class LocationForm(TenancyForm, NestedGroupModelForm):
+class LocationForm(TenancyForm, NetBoxModelForm):
    site = DynamicModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -180,6 +184,8 @@ class LocationForm(TenancyForm, NestedGroupModelForm):
            'site_id': '$site'
        }
    )
+    slug = SlugField()
+    comments = CommentField()

    fieldsets = (
        FieldSet('site', 'parent', 'name', 'slug', 'status', 'facility', 'description', 'tags', name=_('Location')),
@@ -189,12 +195,14 @@ class LocationForm(TenancyForm, NestedGroupModelForm):
    class Meta:
        model = Location
        fields = (
-            'site', 'parent', 'name', 'slug', 'status', 'description', 'tenant_group', 'tenant', 'facility', 'owner',
-            'comments', 'tags',
+            'site', 'parent', 'name', 'slug', 'status', 'description', 'tenant_group', 'tenant',
+            'facility', 'tags', 'comments',
        )


-class RackRoleForm(OrganizationalModelForm):
+class RackRoleForm(NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
        FieldSet('name', 'slug', 'color', 'description', 'tags', name=_('Rack Role')),
    )
@@ -202,16 +210,17 @@ class RackRoleForm(OrganizationalModelForm):
    class Meta:
        model = RackRole
        fields = [
-            'name', 'slug', 'color', 'description', 'owner', 'tags',
+            'name', 'slug', 'color', 'description', 'tags',
        ]


-class RackTypeForm(PrimaryModelForm):
+class RackTypeForm(NetBoxModelForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
        quick_add=True
    )
+    comments = CommentField()
    slug = SlugField(
        label=_('Slug'),
        slug_source='model'
@@ -233,11 +242,11 @@ class RackTypeForm(PrimaryModelForm):
        fields = [
            'manufacturer', 'model', 'slug', 'form_factor', 'width', 'u_height', 'starting_unit', 'desc_units',
            'outer_width', 'outer_height', 'outer_depth', 'outer_unit', 'mounting_depth', 'weight', 'max_weight',
-            'weight_unit', 'description', 'owner', 'comments', 'tags',
+            'weight_unit', 'description', 'comments', 'tags',
        ]


-class RackForm(TenancyForm, PrimaryModelForm):
+class RackForm(TenancyForm, NetBoxModelForm):
    site = DynamicModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -260,9 +269,9 @@ class RackForm(TenancyForm, PrimaryModelForm):
        label=_('Rack Type'),
        queryset=RackType.objects.all(),
        required=False,
-        selector=True,
-        help_text=_("Select a pre-defined rack type, or set physical characteristics below."),
+        help_text=_("Select a pre-defined rack type, or set physical characteristics below.")
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -279,7 +288,7 @@ class RackForm(TenancyForm, PrimaryModelForm):
            'site', 'location', 'name', 'facility_id', 'tenant_group', 'tenant', 'status', 'role', 'serial',
            'asset_tag', 'rack_type', 'form_factor', 'width', 'u_height', 'starting_unit', 'desc_units', 'outer_width',
            'outer_height', 'outer_depth', 'outer_unit', 'mounting_depth', 'airflow', 'weight', 'max_weight',
-            'weight_unit', 'description', 'owner', 'comments', 'tags',
+            'weight_unit', 'description', 'comments', 'tags',
        ]

    def __init__(self, *args, **kwargs):
@@ -309,7 +318,7 @@ class RackForm(TenancyForm, PrimaryModelForm):
            )


-class RackReservationForm(TenancyForm, PrimaryModelForm):
+class RackReservationForm(TenancyForm, NetBoxModelForm):
    rack = DynamicModelChoiceField(
        label=_('Rack'),
        queryset=Rack.objects.all(),
@@ -324,6 +333,7 @@ class RackReservationForm(TenancyForm, PrimaryModelForm):
        label=_('User'),
        queryset=User.objects.order_by('username')
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('rack', 'units', 'status', 'user', 'description', 'tags', name=_('Reservation')),
@@ -333,11 +343,13 @@ class RackReservationForm(TenancyForm, PrimaryModelForm):
    class Meta:
        model = RackReservation
        fields = [
-            'rack', 'units', 'status', 'user', 'tenant_group', 'tenant', 'description', 'owner', 'comments', 'tags',
+            'rack', 'units', 'status', 'user', 'tenant_group', 'tenant', 'description', 'comments', 'tags',
        ]


-class ManufacturerForm(OrganizationalModelForm):
+class ManufacturerForm(NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
        FieldSet('name', 'slug', 'description', 'tags', name=_('Manufacturer')),
    )
@@ -345,11 +357,11 @@ class ManufacturerForm(OrganizationalModelForm):
    class Meta:
        model = Manufacturer
        fields = [
-            'name', 'slug', 'description', 'owner', 'tags',
+            'name', 'slug', 'description', 'tags',
        ]


-class DeviceTypeForm(PrimaryModelForm):
+class DeviceTypeForm(NetBoxModelForm):
    manufacturer = DynamicModelChoiceField(
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all(),
@@ -368,6 +380,7 @@ class DeviceTypeForm(PrimaryModelForm):
        label=_('Slug'),
        slug_source='model'
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('manufacturer', 'model', 'slug', 'default_platform', 'description', 'tags', name=_('Device Type')),
@@ -383,7 +396,7 @@ class DeviceTypeForm(PrimaryModelForm):
        fields = [
            'manufacturer', 'model', 'slug', 'default_platform', 'part_number', 'u_height', 'exclude_from_utilization',
            'is_full_depth', 'subdevice_role', 'airflow', 'weight', 'weight_unit', 'front_image', 'rear_image',
-            'description', 'owner', 'comments', 'tags',
+            'description', 'comments', 'tags',
        ]
        widgets = {
            'front_image': ClearableFileInput(attrs={
@@ -395,12 +408,13 @@ class DeviceTypeForm(PrimaryModelForm):
        }


-class ModuleTypeProfileForm(PrimaryModelForm):
+class ModuleTypeProfileForm(NetBoxModelForm):
    schema = JSONField(
        label=_('Schema'),
        required=False,
        help_text=_("Enter a valid JSON schema to define supported attributes.")
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('name', 'description', 'schema', 'tags', name=_('Profile')),
@@ -409,11 +423,11 @@ class ModuleTypeProfileForm(PrimaryModelForm):
    class Meta:
        model = ModuleTypeProfile
        fields = [
-            'name', 'description', 'schema', 'owner', 'comments', 'tags',
+            'name', 'description', 'schema', 'comments', 'tags',
        ]


-class ModuleTypeForm(PrimaryModelForm):
+class ModuleTypeForm(NetBoxModelForm):
    profile = forms.ModelChoiceField(
        queryset=ModuleTypeProfile.objects.all(),
        label=_('Profile'),
@@ -424,6 +438,7 @@ class ModuleTypeForm(PrimaryModelForm):
        label=_('Manufacturer'),
        queryset=Manufacturer.objects.all()
    )
+    comments = CommentField()

    @property
    def fieldsets(self):
@@ -437,7 +452,7 @@ class ModuleTypeForm(PrimaryModelForm):
        model = ModuleType
        fields = [
            'profile', 'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit',
-            'owner', 'comments', 'tags',
+            'comments', 'tags',
        ]

    def __init__(self, *args, **kwargs):
@@ -492,17 +507,19 @@ class ModuleTypeForm(PrimaryModelForm):
        return super()._post_clean()


-class DeviceRoleForm(NestedGroupModelForm):
+class DeviceRoleForm(NetBoxModelForm):
    config_template = DynamicModelChoiceField(
        label=_('Config template'),
        queryset=ConfigTemplate.objects.all(),
        required=False
    )
+    slug = SlugField()
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=DeviceRole.objects.all(),
        required=False,
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -514,11 +531,11 @@ class DeviceRoleForm(NestedGroupModelForm):
    class Meta:
        model = DeviceRole
        fields = [
-            'name', 'slug', 'parent', 'color', 'vm_role', 'config_template', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'parent', 'color', 'vm_role', 'config_template', 'description', 'comments', 'tags',
        ]


-class PlatformForm(NestedGroupModelForm):
+class PlatformForm(NetBoxModelForm):
    parent = DynamicModelChoiceField(
        label=_('Parent'),
        queryset=Platform.objects.all(),
@@ -539,6 +556,7 @@ class PlatformForm(NestedGroupModelForm):
        label=_('Slug'),
        max_length=64
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -549,11 +567,11 @@ class PlatformForm(NestedGroupModelForm):
    class Meta:
        model = Platform
        fields = [
-            'name', 'slug', 'parent', 'manufacturer', 'config_template', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'parent', 'manufacturer', 'config_template', 'description', 'comments', 'tags',
        ]


-class DeviceForm(TenancyForm, PrimaryModelForm):
+class DeviceForm(TenancyForm, NetBoxModelForm):
    site = DynamicModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -623,6 +641,7 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
            'site_id': ['$site', 'null']
        },
    )
+    comments = CommentField()
    local_context_data = JSONField(
        required=False,
        label=''
@@ -658,7 +677,7 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
            'name', 'role', 'device_type', 'serial', 'asset_tag', 'site', 'rack', 'location', 'position', 'face',
            'latitude', 'longitude', 'status', 'airflow', 'platform', 'primary_ip4', 'primary_ip6', 'oob_ip', 'cluster',
            'tenant_group', 'tenant', 'virtual_chassis', 'vc_position', 'vc_priority', 'description', 'config_template',
-            'owner', 'comments', 'tags', 'local_context_data',
+            'comments', 'tags', 'local_context_data',
        ]

    def __init__(self, *args, **kwargs):
@@ -723,7 +742,7 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
            self.fields['position'].widget.choices = [(position, f'U{position}')]


-class ModuleForm(ModuleCommonForm, PrimaryModelForm):
+class ModuleForm(ModuleCommonForm, NetBoxModelForm):
    device = DynamicModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -736,10 +755,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
        queryset=ModuleBay.objects.all(),
        query_params={
            'device_id': '$device'
-        },
-        context={
-            'disabled': 'installed_module',
-        },
+        }
    )
    module_type = DynamicModelChoiceField(
        label=_('Module type'),
@@ -749,6 +765,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
        },
        selector=True
    )
+    comments = CommentField()
    replicate_components = forms.BooleanField(
        label=_('Replicate components'),
        required=False,
@@ -771,7 +788,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
        model = Module
        fields = [
            'device', 'module_bay', 'module_type', 'status', 'serial', 'asset_tag', 'tags', 'replicate_components',
-            'adopt_components', 'description', 'owner', 'comments',
+            'adopt_components', 'description', 'comments',
        ]

    def __init__(self, *args, **kwargs):
@@ -792,7 +809,7 @@ def get_termination_type_choices():
    ])


-class CableForm(TenancyForm, PrimaryModelForm):
+class CableForm(TenancyForm, NetBoxModelForm):
    a_terminations_type = forms.ChoiceField(
        choices=get_termination_type_choices,
        required=False,
@@ -805,16 +822,17 @@ class CableForm(TenancyForm, PrimaryModelForm):
        widget=HTMXSelect(),
        label=_('Type')
    )
+    comments = CommentField()

    class Meta:
        model = Cable
        fields = [
-            'a_terminations_type', 'b_terminations_type', 'type', 'status', 'profile', 'tenant_group', 'tenant',
-            'label', 'color', 'length', 'length_unit', 'description', 'owner', 'comments', 'tags',
+            'a_terminations_type', 'b_terminations_type', 'type', 'status', 'tenant_group', 'tenant', 'label', 'color',
+            'length', 'length_unit', 'description', 'comments', 'tags',
        ]


-class PowerPanelForm(PrimaryModelForm):
+class PowerPanelForm(NetBoxModelForm):
    site = DynamicModelChoiceField(
        label=_('Site'),
        queryset=Site.objects.all(),
@@ -828,6 +846,7 @@ class PowerPanelForm(PrimaryModelForm):
            'site_id': '$site'
        }
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet('site', 'location', 'name', 'description', 'tags', name=_('Power Panel')),
@@ -836,11 +855,11 @@ class PowerPanelForm(PrimaryModelForm):
    class Meta:
        model = PowerPanel
        fields = [
-            'site', 'location', 'name', 'description', 'owner', 'comments', 'tags',
+            'site', 'location', 'name', 'description', 'comments', 'tags',
        ]


-class PowerFeedForm(TenancyForm, PrimaryModelForm):
+class PowerFeedForm(TenancyForm, NetBoxModelForm):
    power_panel = DynamicModelChoiceField(
        label=_('Power panel'),
        queryset=PowerPanel.objects.all(),
@@ -853,6 +872,7 @@ class PowerFeedForm(TenancyForm, PrimaryModelForm):
        required=False,
        selector=True
    )
+    comments = CommentField()

    fieldsets = (
        FieldSet(
@@ -867,7 +887,7 @@ class PowerFeedForm(TenancyForm, PrimaryModelForm):
        model = PowerFeed
        fields = [
            'power_panel', 'rack', 'name', 'status', 'type', 'mark_connected', 'supply', 'phase', 'voltage', 'amperage',
-            'max_utilization', 'tenant_group', 'tenant', 'description', 'owner', 'comments', 'tags'
+            'max_utilization', 'tenant_group', 'tenant', 'description', 'comments', 'tags'
        ]


@@ -875,17 +895,18 @@ class PowerFeedForm(TenancyForm, PrimaryModelForm):
 # Virtual chassis
 #

-class VirtualChassisForm(PrimaryModelForm):
+class VirtualChassisForm(NetBoxModelForm):
    master = forms.ModelChoiceField(
        label=_('Master'),
        queryset=Device.objects.all(),
        required=False,
    )
+    comments = CommentField()

    class Meta:
        model = VirtualChassis
        fields = [
-            'name', 'domain', 'master', 'description', 'owner', 'comments', 'tags',
+            'name', 'domain', 'master', 'description', 'comments', 'tags',
        ]
        widgets = {
            'master': SelectWithPK(),
@@ -1113,66 +1134,34 @@ class InterfaceTemplateForm(ModularComponentTemplateForm):
        ]


-class FrontPortTemplateForm(FrontPortFormMixin, ModularComponentTemplateForm):
+class FrontPortTemplateForm(ModularComponentTemplateForm):
+    rear_port = DynamicModelChoiceField(
+        label=_('Rear port'),
+        queryset=RearPortTemplate.objects.all(),
+        required=False,
+        query_params={
+            'device_type_id': '$device_type',
+            'module_type_id': '$module_type',
+        }
+    )
+
    fieldsets = (
        FieldSet(
            TabbedGroups(
                FieldSet('device_type', name=_('Device Type')),
                FieldSet('module_type', name=_('Module Type')),
            ),
-            'name', 'label', 'type', 'positions', 'rear_ports', 'description',
+            'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'description',
        ),
    )

-    # Override FrontPortFormMixin attrs
-    port_mapping_model = PortTemplateMapping
-    parent_field = 'device_type'
-
    class Meta:
        model = FrontPortTemplate
        fields = [
-            'device_type', 'module_type', 'name', 'label', 'type', 'color', 'positions', 'description',
+            'device_type', 'module_type', 'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position',
+            'description',
        ]

-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if device_type_id := self.data.get('device_type') or self.initial.get('device_type'):
-            device_type = DeviceType.objects.get(pk=device_type_id)
-        else:
-            return
-
-        # Populate rear port choices
-        self.fields['rear_ports'].choices = self._get_rear_port_choices(device_type, self.instance)
-
-        # Set initial rear port mappings
-        if self.instance.pk:
-            self.initial['rear_ports'] = [
-                f'{mapping.rear_port_id}:{mapping.rear_port_position}'
-                for mapping in PortTemplateMapping.objects.filter(front_port_id=self.instance.pk)
-            ]
-
-    def _get_rear_port_choices(self, device_type, front_port):
-        """
-        Return a list of choices representing each available rear port & position pair on the device type, excluding
-        those assigned to the specified instance.
-        """
-        occupied_rear_port_positions = [
-            f'{mapping.rear_port_id}:{mapping.rear_port_position}'
-            for mapping in device_type.port_mappings.exclude(front_port=front_port.pk)
-        ]
-
-        choices = []
-        for rear_port in RearPortTemplate.objects.filter(device_type=device_type):
-            for i in range(1, rear_port.positions + 1):
-                pair_id = f'{rear_port.pk}:{i}'
-                if pair_id not in occupied_rear_port_positions:
-                    pair_label = f'{rear_port.name}:{i}'
-                    choices.append(
-                        (pair_id, pair_label)
-                    )
-        return choices
-

 class RearPortTemplateForm(ModularComponentTemplateForm):
    fieldsets = (
@@ -1371,7 +1360,7 @@ class InventoryItemTemplateForm(ComponentTemplateForm):
 # Device components
 #

-class DeviceComponentForm(OwnerMixin, NetBoxModelForm):
+class DeviceComponentForm(NetBoxModelForm):
    device = DynamicModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1407,7 +1396,7 @@ class ConsolePortForm(ModularDeviceComponentForm):
    class Meta:
        model = ConsolePort
        fields = [
-            'device', 'module', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'owner', 'tags',
+            'device', 'module', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'tags',
        ]


@@ -1421,7 +1410,7 @@ class ConsoleServerPortForm(ModularDeviceComponentForm):
    class Meta:
        model = ConsoleServerPort
        fields = [
-            'device', 'module', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'owner', 'tags',
+            'device', 'module', 'name', 'label', 'type', 'speed', 'mark_connected', 'description', 'tags',
        ]


@@ -1437,7 +1426,7 @@ class PowerPortForm(ModularDeviceComponentForm):
        model = PowerPort
        fields = [
            'device', 'module', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'mark_connected',
-            'description', 'owner', 'tags',
+            'description', 'tags',
        ]


@@ -1454,7 +1443,7 @@ class PowerOutletForm(ModularDeviceComponentForm):
    fieldsets = (
        FieldSet(
            'device', 'module', 'name', 'label', 'type', 'status', 'color', 'power_port', 'feed_leg', 'mark_connected',
-            'description', 'owner', 'tags',
+            'description', 'tags',
        ),
    )

@@ -1598,7 +1587,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
            'lag', 'wwn', 'mtu', 'mgmt_only', 'mark_connected', 'description', 'poe_mode', 'poe_type', 'mode',
            'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'wireless_lans',
            'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', 'vrf', 'primary_mac_address',
-            'owner', 'tags',
+            'tags',
        ]
        widgets = {
            'speed': NumberWithOptions(
@@ -1611,10 +1600,17 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
        }


-class FrontPortForm(FrontPortFormMixin, ModularDeviceComponentForm):
+class FrontPortForm(ModularDeviceComponentForm):
+    rear_port = DynamicModelChoiceField(
+        queryset=RearPort.objects.all(),
+        query_params={
+            'device_id': '$device',
+        }
+    )
+
    fieldsets = (
        FieldSet(
-            'device', 'module', 'name', 'label', 'type', 'color', 'positions', 'rear_ports', 'mark_connected',
+            'device', 'module', 'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'mark_connected',
            'description', 'tags',
        ),
    )
@@ -1622,49 +1618,10 @@ class FrontPortForm(FrontPortFormMixin, ModularDeviceComponentForm):
    class Meta:
        model = FrontPort
        fields = [
-            'device', 'module', 'name', 'label', 'type', 'color', 'positions', 'mark_connected', 'description', 'owner',
-            'tags',
+            'device', 'module', 'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'mark_connected',
+            'description', 'tags',
        ]

-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if device_id := self.data.get('device') or self.initial.get('device'):
-            device = Device.objects.get(pk=device_id)
-        else:
-            return
-
-        # Populate rear port choices
-        self.fields['rear_ports'].choices = self._get_rear_port_choices(device, self.instance)
-
-        # Set initial rear port mappings
-        if self.instance.pk:
-            self.initial['rear_ports'] = [
-                f'{mapping.rear_port_id}:{mapping.rear_port_position}'
-                for mapping in PortMapping.objects.filter(front_port_id=self.instance.pk)
-            ]
-
-    def _get_rear_port_choices(self, device, front_port):
-        """
-        Return a list of choices representing each available rear port & position pair on the device, excluding those
-        assigned to the specified instance.
-        """
-        occupied_rear_port_positions = [
-            f'{mapping.rear_port_id}:{mapping.rear_port_position}'
-            for mapping in device.port_mappings.exclude(front_port=front_port.pk)
-        ]
-
-        choices = []
-        for rear_port in RearPort.objects.filter(device=device):
-            for i in range(1, rear_port.positions + 1):
-                pair_id = f'{rear_port.pk}:{i}'
-                if pair_id not in occupied_rear_port_positions:
-                    pair_label = f'{rear_port.name}:{i}'
-                    choices.append(
-                        (pair_id, pair_label)
-                    )
-        return choices
-

 class RearPortForm(ModularDeviceComponentForm):
    fieldsets = (
@@ -1676,8 +1633,7 @@ class RearPortForm(ModularDeviceComponentForm):
    class Meta:
        model = RearPort
        fields = [
-            'device', 'module', 'name', 'label', 'type', 'color', 'positions', 'mark_connected', 'description', 'owner',
-            'tags',
+            'device', 'module', 'name', 'label', 'type', 'color', 'positions', 'mark_connected', 'description', 'tags',
        ]


@@ -1689,7 +1645,7 @@ class ModuleBayForm(ModularDeviceComponentForm):
    class Meta:
        model = ModuleBay
        fields = [
-            'device', 'module', 'name', 'label', 'position', 'description', 'owner', 'tags',
+            'device', 'module', 'name', 'label', 'position', 'description', 'tags',
        ]


@@ -1701,7 +1657,7 @@ class DeviceBayForm(DeviceComponentForm):
    class Meta:
        model = DeviceBay
        fields = [
-            'device', 'name', 'label', 'description', 'owner', 'tags',
+            'device', 'name', 'label', 'description', 'tags',
        ]


@@ -1826,7 +1782,7 @@ class InventoryItemForm(DeviceComponentForm):
        model = InventoryItem
        fields = [
            'device', 'parent', 'name', 'label', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag',
-            'status', 'description', 'owner', 'tags',
+            'status', 'description', 'tags',
        ]

    def __init__(self, *args, **kwargs):
@@ -1872,7 +1828,12 @@ class InventoryItemForm(DeviceComponentForm):
            self.instance.component = None


-class InventoryItemRoleForm(OrganizationalModelForm):
+# Device component roles
+#
+
+class InventoryItemRoleForm(NetBoxModelForm):
+    slug = SlugField()
+
    fieldsets = (
        FieldSet('name', 'slug', 'color', 'description', 'tags', name=_('Inventory Item Role')),
    )
@@ -1880,11 +1841,11 @@ class InventoryItemRoleForm(OrganizationalModelForm):
    class Meta:
        model = InventoryItemRole
        fields = [
-            'name', 'slug', 'color', 'description', 'owner', 'tags',
+            'name', 'slug', 'color', 'description', 'tags',
        ]


-class VirtualDeviceContextForm(TenancyForm, PrimaryModelForm):
+class VirtualDeviceContextForm(TenancyForm, NetBoxModelForm):
    device = DynamicModelChoiceField(
        label=_('Device'),
        queryset=Device.objects.all(),
@@ -1920,7 +1881,7 @@ class VirtualDeviceContextForm(TenancyForm, PrimaryModelForm):
    class Meta:
        model = VirtualDeviceContext
        fields = [
-            'device', 'name', 'status', 'identifier', 'primary_ip4', 'primary_ip6', 'tenant_group', 'tenant', 'owner',
+            'device', 'name', 'status', 'identifier', 'primary_ip4', 'primary_ip6', 'tenant_group', 'tenant',
            'comments', 'tags'
        ]

@@ -1929,7 +1890,7 @@ class VirtualDeviceContextForm(TenancyForm, PrimaryModelForm):
 # Addressing
 #

-class MACAddressForm(PrimaryModelForm):
+class MACAddressForm(NetBoxModelForm):
    mac_address = forms.CharField(
        required=True,
        label=_('MAC address')
@@ -1968,7 +1929,7 @@ class MACAddressForm(PrimaryModelForm):
    class Meta:
        model = MACAddress
        fields = [
-            'mac_address', 'interface', 'vminterface', 'description', 'owner', 'tags',
+            'mac_address', 'interface', 'vminterface', 'description', 'tags',
        ]

    def __init__(self, *args, **kwargs):
--- a/netbox/dcim/forms/object_create.py
+++ b/netbox/dcim/forms/object_create.py
@@ -109,36 +109,69 @@ class InterfaceTemplateCreateForm(ComponentCreateForm, model_forms.InterfaceTemp


 class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemplateForm):
+    rear_port = forms.MultipleChoiceField(
+        choices=[],
+        label=_('Rear ports'),
+        help_text=_('Select one rear port assignment for each front port being created.'),
+        widget=forms.SelectMultiple(attrs={'size': 6})
+    )

-    # Override fieldsets from FrontPortTemplateForm
+    # Override fieldsets from FrontPortTemplateForm to omit rear_port_position
    fieldsets = (
        FieldSet(
            TabbedGroups(
                FieldSet('device_type', name=_('Device Type')),
                FieldSet('module_type', name=_('Module Type')),
            ),
-            'name', 'label', 'type', 'color', 'positions', 'rear_ports', 'description',
+            'name', 'label', 'type', 'color', 'rear_port', 'description',
        ),
    )

-    class Meta:
-        model = FrontPortTemplate
-        fields = (
-            'device_type', 'module_type', 'type', 'color', 'positions', 'description',
-        )
+    class Meta(model_forms.FrontPortTemplateForm.Meta):
+        exclude = ('name', 'label', 'rear_port', 'rear_port_position')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # TODO: This needs better validation
+        if 'device_type' in self.initial or self.data.get('device_type'):
+            parent = DeviceType.objects.get(
+                pk=self.initial.get('device_type') or self.data.get('device_type')
+            )
+        elif 'module_type' in self.initial or self.data.get('module_type'):
+            parent = ModuleType.objects.get(
+                pk=self.initial.get('module_type') or self.data.get('module_type')
+            )
+        else:
+            return
+
+        # Determine which rear port positions are occupied. These will be excluded from the list of available mappings.
+        occupied_port_positions = [
+            (front_port.rear_port_id, front_port.rear_port_position)
+            for front_port in parent.frontporttemplates.all()
+        ]
+
+        # Populate rear port choices
+        choices = []
+        rear_ports = parent.rearporttemplates.all()
+        for rear_port in rear_ports:
+            for i in range(1, rear_port.positions + 1):
+                if (rear_port.pk, i) not in occupied_port_positions:
+                    choices.append(
+                        ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
+                    )
+        self.fields['rear_port'].choices = choices

    def clean(self):
-        # TODO
-        # super(ComponentCreateForm, self).clean()
+        super().clean()

        # Check that the number of FrontPortTemplates to be created matches the selected number of RearPortTemplate
        # positions
-        positions = self.cleaned_data['positions']
        frontport_count = len(self.cleaned_data['name'])
-        rearport_count = len(self.cleaned_data['rear_ports'])
-        if frontport_count * positions != rearport_count:
+        rearport_count = len(self.cleaned_data['rear_port'])
+        if frontport_count != rearport_count:
            raise forms.ValidationError({
-                'rear_ports': _(
+                'rear_port': _(
                    "The number of front port templates to be created ({frontport_count}) must match the selected "
                    "number of rear port positions ({rearport_count})."
                ).format(
@@ -148,11 +181,13 @@ class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemp
            })

    def get_iterative_data(self, iteration):
-        positions = self.cleaned_data['positions']
-        offset = positions * iteration
+
+        # Assign rear port and position from selected set
+        rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')

        return {
-            'rear_ports': self.cleaned_data['rear_ports'][offset:offset + positions]
+            'rear_port': int(rear_port),
+            'rear_port_position': int(position),
        }


@@ -234,31 +269,58 @@ class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
            }
        )
    )
+    rear_port = forms.MultipleChoiceField(
+        choices=[],
+        label=_('Rear ports'),
+        help_text=_('Select one rear port assignment for each front port being created.'),
+        widget=forms.SelectMultiple(attrs={'size': 6})
+    )

    # Override fieldsets from FrontPortForm to omit rear_port_position
    fieldsets = (
        FieldSet(
-            'device', 'module', 'name', 'label', 'type', 'color', 'positions', 'rear_ports', 'mark_connected',
-            'description', 'tags',
+            'device', 'module', 'name', 'label', 'type', 'color', 'rear_port', 'mark_connected', 'description', 'tags',
        ),
    )

-    class Meta:
-        model = FrontPort
-        fields = [
-            'device', 'module', 'type', 'color', 'positions', 'mark_connected', 'description', 'owner', 'tags',
+    class Meta(model_forms.FrontPortForm.Meta):
+        exclude = ('name', 'label', 'rear_port', 'rear_port_position')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if device_id := self.data.get('device') or self.initial.get('device'):
+            device = Device.objects.get(pk=device_id)
+        else:
+            return
+
+        # Determine which rear port positions are occupied. These will be excluded from the list of available
+        # mappings.
+        occupied_port_positions = [
+            (front_port.rear_port_id, front_port.rear_port_position)
+            for front_port in device.frontports.all()
        ]

-    def clean(self):
-        super(NetBoxModelForm, self).clean()
+        # Populate rear port choices
+        choices = []
+        rear_ports = RearPort.objects.filter(device=device)
+        for rear_port in rear_ports:
+            for i in range(1, rear_port.positions + 1):
+                if (rear_port.pk, i) not in occupied_port_positions:
+                    choices.append(
+                        ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
+                    )
+        self.fields['rear_port'].choices = choices

-        # Check that the number of FrontPorts to be created matches the selected number of RearPorts
-        positions = self.cleaned_data['positions']
+    def clean(self):
+        super().clean()
+
+        # Check that the number of FrontPorts to be created matches the selected number of RearPort positions
        frontport_count = len(self.cleaned_data['name'])
-        rearport_count = len(self.cleaned_data['rear_ports'])
-        if frontport_count * positions != rearport_count:
+        rearport_count = len(self.cleaned_data['rear_port'])
+        if frontport_count != rearport_count:
            raise forms.ValidationError({
-                'rear_ports': _(
+                'rear_port': _(
                    "The number of front ports to be created ({frontport_count}) must match the selected number of "
                    "rear port positions ({rearport_count})."
                ).format(
@@ -268,10 +330,13 @@ class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
            })

    def get_iterative_data(self, iteration):
-        positions = self.cleaned_data['positions']
-        offset = positions * iteration
+
+        # Assign rear port and position from selected set
+        rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')
+
        return {
-            'rear_ports': self.cleaned_data['rear_ports'][offset:offset + positions]
+            'rear_port': int(rear_port),
+            'rear_port_position': int(position),
        }


@@ -369,8 +434,8 @@ class VirtualChassisCreateForm(NetBoxModelForm):
    class Meta:
        model = VirtualChassis
        fields = [
-            'name', 'domain', 'description', 'region', 'site_group', 'site', 'rack', 'owner', 'members',
-            'initial_position', 'tags',
+            'name', 'domain', 'description', 'region', 'site_group', 'site', 'rack', 'members', 'initial_position',
+            'tags',
        ]

    def clean(self):
@@ -388,7 +453,6 @@ class VirtualChassisCreateForm(NetBoxModelForm):
        if instance.pk and self.cleaned_data['members']:
            initial_position = self.cleaned_data.get('initial_position', 1)
            for i, member in enumerate(self.cleaned_data['members'], start=initial_position):
-                member.snapshot()
                member.virtual_chassis = instance
                member.vc_position = i
                member.save()
--- a/netbox/dcim/forms/object_import.py
+++ b/netbox/dcim/forms/object_import.py
@@ -13,7 +13,6 @@ __all__ = (
    'InterfaceTemplateImportForm',
    'InventoryItemTemplateImportForm',
    'ModuleBayTemplateImportForm',
-    'PortTemplateMappingImportForm',
    'PowerOutletTemplateImportForm',
    'PowerPortTemplateImportForm',
    'RearPortTemplateImportForm',
@@ -114,11 +113,31 @@ class FrontPortTemplateImportForm(forms.ModelForm):
        label=_('Type'),
        choices=PortTypeChoices.CHOICES
    )
+    rear_port = forms.ModelChoiceField(
+        label=_('Rear port'),
+        queryset=RearPortTemplate.objects.all(),
+        to_field_name='name'
+    )
+
+    def clean_device_type(self):
+        if device_type := self.cleaned_data['device_type']:
+            rear_port = self.fields['rear_port']
+            rear_port.queryset = rear_port.queryset.filter(device_type=device_type)
+
+        return device_type
+
+    def clean_module_type(self):
+        if module_type := self.cleaned_data['module_type']:
+            rear_port = self.fields['rear_port']
+            rear_port.queryset = rear_port.queryset.filter(module_type=module_type)
+
+        return module_type

    class Meta:
        model = FrontPortTemplate
        fields = [
-            'device_type', 'module_type', 'name', 'type', 'color', 'positions', 'label', 'description',
+            'device_type', 'module_type', 'name', 'type', 'color', 'rear_port', 'rear_port_position', 'label',
+            'description',
        ]


@@ -135,25 +154,6 @@ class RearPortTemplateImportForm(forms.ModelForm):
        ]


-class PortTemplateMappingImportForm(forms.ModelForm):
-    front_port = forms.ModelChoiceField(
-        label=_('Front port'),
-        queryset=FrontPortTemplate.objects.all(),
-        to_field_name='name',
-    )
-    rear_port = forms.ModelChoiceField(
-        label=_('Rear port'),
-        queryset=RearPortTemplate.objects.all(),
-        to_field_name='name',
-    )
-
-    class Meta:
-        model = PortTemplateMapping
-        fields = [
-            'front_port', 'front_port_position', 'rear_port', 'rear_port_position',
-        ]
-
-
 class ModuleBayTemplateImportForm(forms.ModelForm):

    class Meta:
--- a/netbox/dcim/graphql/enums.py
+++ b/netbox/dcim/graphql/enums.py
@@ -28,13 +28,11 @@ __all__ = (
    'PowerFeedSupplyEnum',
    'PowerFeedTypeEnum',
    'PowerOutletFeedLegEnum',
-    'PowerOutletStatusEnum',
    'PowerOutletTypeEnum',
    'PowerPortTypeEnum',
    'RackAirflowEnum',
    'RackDimensionUnitEnum',
    'RackFormFactorEnum',
-    'RackReservationStatusEnum',
    'RackStatusEnum',
    'RackWidthEnum',
    'SiteStatusEnum',
@@ -67,13 +65,11 @@ PowerFeedStatusEnum = strawberry.enum(PowerFeedStatusChoices.as_enum(prefix='sta
 PowerFeedSupplyEnum = strawberry.enum(PowerFeedSupplyChoices.as_enum(prefix='supply'))
 PowerFeedTypeEnum = strawberry.enum(PowerFeedTypeChoices.as_enum(prefix='type'))
 PowerOutletFeedLegEnum = strawberry.enum(PowerOutletFeedLegChoices.as_enum(prefix='feed_leg'))
-PowerOutletStatusEnum = strawberry.enum(PowerOutletStatusChoices.as_enum(prefix='status'))
 PowerOutletTypeEnum = strawberry.enum(PowerOutletTypeChoices.as_enum(prefix='type'))
 PowerPortTypeEnum = strawberry.enum(PowerPortTypeChoices.as_enum(prefix='type'))
 RackAirflowEnum = strawberry.enum(RackAirflowChoices.as_enum())
 RackDimensionUnitEnum = strawberry.enum(RackDimensionUnitChoices.as_enum(prefix='unit'))
 RackFormFactorEnum = strawberry.enum(RackFormFactorChoices.as_enum(prefix='type'))
-RackReservationStatusEnum = strawberry.enum(RackReservationStatusChoices.as_enum(prefix='status'))
 RackStatusEnum = strawberry.enum(RackStatusChoices.as_enum(prefix='status'))
 RackWidthEnum = strawberry.enum(RackWidthChoices.as_enum(prefix='width'))
 SiteStatusEnum = strawberry.enum(SiteStatusChoices.as_enum(prefix='status'))
--- a/netbox/dcim/graphql/filter_mixins.py
+++ b/netbox/dcim/graphql/filter_mixins.py
@@ -4,7 +4,7 @@ from typing import Annotated, TYPE_CHECKING
 import strawberry
 import strawberry_django
 from strawberry import ID
-from strawberry_django import BaseFilterLookup, FilterLookup
+from strawberry_django import FilterLookup

 from core.graphql.filter_mixins import BaseFilterMixin, ChangeLogFilterMixin
 from core.graphql.filters import ContentTypeFilter
@@ -60,9 +60,7 @@ class ModularComponentModelFilterMixin(ComponentModelFilterMixin):
 class CabledObjectModelFilterMixin(BaseFilterMixin):
    cable: Annotated['CableFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    cable_id: ID | None = strawberry_django.filter_field()
-    cable_end: (
-        BaseFilterLookup[Annotated['CableEndEnum', strawberry.lazy('dcim.graphql.enums')]] | None
-    ) = strawberry_django.filter_field()
+    cable_end: CableEndEnum | None = strawberry_django.filter_field()
    mark_connected: FilterLookup[bool] | None = strawberry_django.filter_field()


@@ -98,9 +96,7 @@ class InterfaceBaseFilterMixin(BaseFilterMixin):
    mtu: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    mode: (
-        BaseFilterLookup[Annotated['InterfaceModeEnum', strawberry.lazy('dcim.graphql.enums')]] | None
-    ) = strawberry_django.filter_field()
+    mode: InterfaceModeEnum | None = strawberry_django.filter_field()
    bridge: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -114,9 +110,8 @@ class InterfaceBaseFilterMixin(BaseFilterMixin):
    qinq_svlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    vlan_translation_policy: (
-            Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None
-    ) = strawberry_django.filter_field()
+    vlan_translation_policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None \
+        = strawberry_django.filter_field()
    primary_mac_address: Annotated['MACAddressFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
@@ -125,9 +120,7 @@ class InterfaceBaseFilterMixin(BaseFilterMixin):

@dataclass
 class RackBaseFilterMixin(WeightFilterMixin, PrimaryModelFilterMixin):
-    width: BaseFilterLookup[Annotated['RackWidthEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    width: Annotated['RackWidthEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
    u_height: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -144,7 +137,7 @@ class RackBaseFilterMixin(WeightFilterMixin, PrimaryModelFilterMixin):
    outer_depth: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    outer_unit: BaseFilterLookup[Annotated['RackDimensionUnitEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    outer_unit: Annotated['RackDimensionUnitEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    mounting_depth: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
--- a/netbox/dcim/graphql/filters.py
+++ b/netbox/dcim/graphql/filters.py
@@ -4,9 +4,9 @@ from django.db.models import Q
 import strawberry
 import strawberry_django
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, ComparisonFilterLookup, FilterLookup
+from strawberry_django import FilterLookup

-from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
+from core.graphql.filter_mixins import ChangeLogFilterMixin
 from dcim import models
 from dcim.constants import *
 from dcim.graphql.enums import InterfaceKindEnum
@@ -18,9 +18,7 @@ from netbox.graphql.filter_mixins import (
    ImageAttachmentFilterMixin,
    WeightFilterMixin,
 )
-from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
-from virtualization.models import VMInterface
-
+from tenancy.graphql.filter_mixins import TenancyFilterMixin, ContactFilterMixin
 from .filter_mixins import (
    CabledObjectModelFilterMixin,
    ComponentModelFilterMixin,
@@ -75,8 +73,6 @@ __all__ = (
    'ModuleTypeFilter',
    'ModuleTypeProfileFilter',
    'PlatformFilter',
-    'PortMappingFilter',
-    'PortTemplateMappingFilter',
    'PowerFeedFilter',
    'PowerOutletFilter',
    'PowerOutletTemplateFilter',
@@ -99,20 +95,14 @@ __all__ = (

@strawberry_django.filter_type(models.Cable, lookups=True)
 class CableFilter(PrimaryModelFilterMixin, TenancyFilterMixin):
-    type: BaseFilterLookup[Annotated['CableTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    status: BaseFilterLookup[Annotated['LinkStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    type: Annotated['CableTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    status: Annotated['LinkStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
    label: FilterLookup[str] | None = strawberry_django.filter_field()
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
    length: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    length_unit: BaseFilterLookup[Annotated['CableLengthUnitEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    length_unit: Annotated['CableLengthUnitEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    terminations: Annotated['CableTerminationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -124,7 +114,7 @@ class CableFilter(PrimaryModelFilterMixin, TenancyFilterMixin):
 class CableTerminationFilter(ChangeLogFilterMixin):
    cable: Annotated['CableFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    cable_id: ID | None = strawberry_django.filter_field()
-    cable_end: BaseFilterLookup[Annotated['CableEndEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    cable_end: Annotated['CableEndEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    termination_type: Annotated['CableTerminationFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -135,34 +125,34 @@ class CableTerminationFilter(ChangeLogFilterMixin):

@strawberry_django.filter_type(models.ConsolePort, lookups=True)
 class ConsolePortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    speed: BaseFilterLookup[Annotated['ConsolePortSpeedEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    speed: Annotated['ConsolePortSpeedEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )


@strawberry_django.filter_type(models.ConsolePortTemplate, lookups=True)
 class ConsolePortTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )


@strawberry_django.filter_type(models.ConsoleServerPort, lookups=True)
 class ConsoleServerPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    speed: BaseFilterLookup[Annotated['ConsolePortSpeedEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    speed: Annotated['ConsolePortSpeedEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )


@strawberry_django.filter_type(models.ConsoleServerPortTemplate, lookups=True)
 class ConsoleServerPortTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['ConsolePortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )

@@ -203,13 +193,11 @@ class DeviceFilter(
    position: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    face: BaseFilterLookup[Annotated['DeviceFaceEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    face: Annotated['DeviceFaceEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    status: Annotated['DeviceStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    status: BaseFilterLookup[Annotated['DeviceStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    airflow: BaseFilterLookup[Annotated['DeviceAirflowEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    airflow: Annotated['DeviceAirflowEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    primary_ip4: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
@@ -321,9 +309,7 @@ class InventoryItemTemplateFilter(ComponentTemplateFilterMixin):

@strawberry_django.filter_type(models.DeviceRole, lookups=True)
 class DeviceRoleFilter(OrganizationalModelFilterMixin, RenderConfigFilterMixin):
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
    vm_role: FilterLookup[bool] | None = strawberry_django.filter_field()


@@ -340,18 +326,15 @@ class DeviceTypeFilter(ImageAttachmentFilterMixin, PrimaryModelFilterMixin, Weig
    )
    default_platform_id: ID | None = strawberry_django.filter_field()
    part_number: FilterLookup[str] | None = strawberry_django.filter_field()
-    instances: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
    u_height: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
    exclude_from_utilization: FilterLookup[bool] | None = strawberry_django.filter_field()
    is_full_depth: FilterLookup[bool] | None = strawberry_django.filter_field()
-    subdevice_role: BaseFilterLookup[Annotated['SubdeviceRoleEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    subdevice_role: Annotated['SubdeviceRoleEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    airflow: BaseFilterLookup[Annotated['DeviceAirflowEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    airflow: Annotated['DeviceAirflowEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    front_image: Annotated['ImageAttachmentFilter', strawberry.lazy('extras.graphql.filters')] | None = (
@@ -400,58 +383,32 @@ class DeviceTypeFilter(ImageAttachmentFilterMixin, PrimaryModelFilterMixin, Weig
    device_bay_template_count: FilterLookup[int] | None = strawberry_django.filter_field()
    module_bay_template_count: FilterLookup[int] | None = strawberry_django.filter_field()
    inventory_item_template_count: FilterLookup[int] | None = strawberry_django.filter_field()
-    device_count: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.FrontPort, lookups=True)
 class FrontPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
+    rear_port: Annotated['RearPortFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
+    rear_port_id: ID | None = strawberry_django.filter_field()
+    rear_port_position: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )


@strawberry_django.filter_type(models.FrontPortTemplate, lookups=True)
 class FrontPortTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-
-
-@strawberry_django.filter_type(models.PortMapping, lookups=True)
-class PortMappingFilter(BaseObjectTypeFilterMixin):
-    device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
-    front_port: Annotated['FrontPortFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
-    rear_port: Annotated['RearPortFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
-    front_port_position: FilterLookup[int] | None = strawberry_django.filter_field()
-    rear_port_position: FilterLookup[int] | None = strawberry_django.filter_field()
-
-
-@strawberry_django.filter_type(models.PortTemplateMapping, lookups=True)
-class PortTemplateMappingFilter(BaseObjectTypeFilterMixin):
-    device_type: Annotated['DeviceTypeFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
-    module_type: Annotated['ModuleTypeFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
-    front_port: Annotated['FrontPortTemplateFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
+    type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
    rear_port: Annotated['RearPortTemplateFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
-    front_port_position: FilterLookup[int] | None = strawberry_django.filter_field()
-    rear_port_position: FilterLookup[int] | None = strawberry_django.filter_field()
+    rear_port_id: ID | None = strawberry_django.filter_field()
+    rear_port_position: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+        strawberry_django.filter_field()
+    )


@strawberry_django.filter_type(models.MACAddress, lookups=True)
@@ -462,24 +419,6 @@ class MACAddressFilter(PrimaryModelFilterMixin):
    )
    assigned_object_id: ID | None = strawberry_django.filter_field()

-    @strawberry_django.filter_field()
-    def assigned(self, value: bool, prefix) -> Q:
-        return Q(**{f'{prefix}assigned_object_id__isnull': (not value)})
-
-    @strawberry_django.filter_field()
-    def primary(self, value: bool, prefix) -> Q:
-        interface_mac_ids = models.Interface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        vminterface_mac_ids = VMInterface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        query = Q(**{f'{prefix}pk__in': interface_mac_ids}) | Q(**{f'{prefix}pk__in': vminterface_mac_ids})
-        if value:
-            return Q(query)
-        else:
-            return ~Q(query)
-

@strawberry_django.filter_type(models.Interface, lookups=True)
 class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin, CabledObjectModelFilterMixin):
@@ -488,14 +427,14 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin
    )
    lag: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    lag_id: ID | None = strawberry_django.filter_field()
-    type: BaseFilterLookup[Annotated['InterfaceTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['InterfaceTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    mgmt_only: FilterLookup[bool] | None = strawberry_django.filter_field()
    speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    duplex: BaseFilterLookup[Annotated['InterfaceDuplexEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    duplex: Annotated['InterfaceDuplexEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    wwn: FilterLookup[str] | None = strawberry_django.filter_field()
@@ -503,10 +442,10 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin
        strawberry_django.filter_field()
    )
    parent_id: ID | None = strawberry_django.filter_field()
-    rf_role: BaseFilterLookup[Annotated['WirelessRoleEnum', strawberry.lazy('wireless.graphql.enums')]] | None = (
+    rf_role: Annotated['WirelessRoleEnum', strawberry.lazy('wireless.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    rf_channel: BaseFilterLookup[Annotated['WirelessChannelEnum', strawberry.lazy('wireless.graphql.enums')]] | None = (
+    rf_channel: Annotated['WirelessChannelEnum', strawberry.lazy('wireless.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    rf_channel_frequency: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -518,10 +457,10 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin
    tx_power: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    poe_mode: BaseFilterLookup[Annotated['InterfacePoEModeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    poe_mode: Annotated['InterfacePoEModeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    poe_type: BaseFilterLookup[Annotated['InterfacePoETypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    poe_type: Annotated['InterfacePoETypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    wireless_link: Annotated['WirelessLinkFilter', strawberry.lazy('wireless.graphql.filters')] | None = (
@@ -573,7 +512,7 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin

@strawberry_django.filter_type(models.InterfaceTemplate, lookups=True)
 class InterfaceTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['InterfaceTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['InterfaceTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
@@ -582,13 +521,13 @@ class InterfaceTemplateFilter(ModularComponentTemplateFilterMixin):
        strawberry_django.filter_field()
    )
    bridge_id: ID | None = strawberry_django.filter_field()
-    poe_mode: BaseFilterLookup[Annotated['InterfacePoEModeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    poe_mode: Annotated['InterfacePoEModeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    poe_type: BaseFilterLookup[Annotated['InterfacePoETypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    poe_type: Annotated['InterfacePoETypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    rf_role: BaseFilterLookup[Annotated['WirelessRoleEnum', strawberry.lazy('wireless.graphql.enums')]] | None = (
+    rf_role: Annotated['WirelessRoleEnum', strawberry.lazy('wireless.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )

@@ -603,7 +542,7 @@ class InventoryItemFilter(ComponentModelFilterMixin):
        strawberry_django.filter_field()
    )
    component_id: ID | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['InventoryItemStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    status: Annotated['InventoryItemStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    role: Annotated['InventoryItemRoleFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -622,16 +561,14 @@ class InventoryItemFilter(ComponentModelFilterMixin):

@strawberry_django.filter_type(models.InventoryItemRole, lookups=True)
 class InventoryItemRoleFilter(OrganizationalModelFilterMixin):
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.Location, lookups=True)
 class LocationFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMixin, NestedGroupModelFilterMixin):
    site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    site_id: ID | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['LocationStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    status: Annotated['LocationStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    facility: FilterLookup[str] | None = strawberry_django.filter_field()
@@ -660,7 +597,7 @@ class ModuleFilter(PrimaryModelFilterMixin, ConfigContextFilterMixin):
        strawberry_django.filter_field()
    )
    module_type_id: ID | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['ModuleStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    status: Annotated['ModuleStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    serial: FilterLookup[str] | None = strawberry_django.filter_field()
@@ -728,10 +665,7 @@ class ModuleTypeFilter(ImageAttachmentFilterMixin, PrimaryModelFilterMixin, Weig
    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()
-    instances: Annotated['ModuleFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
-        strawberry_django.filter_field()
-    )
-    airflow: BaseFilterLookup[Annotated['ModuleAirflowEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    airflow: Annotated['ModuleAirflowEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    console_port_templates: (
@@ -764,7 +698,6 @@ class ModuleTypeFilter(ImageAttachmentFilterMixin, PrimaryModelFilterMixin, Weig
    inventory_item_templates: (
        Annotated['InventoryItemTemplateFilter', strawberry.lazy('dcim.graphql.filters')] | None
    ) = strawberry_django.filter_field()
-    module_count: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.Platform, lookups=True)
@@ -788,16 +721,16 @@ class PowerFeedFilter(CabledObjectModelFilterMixin, TenancyFilterMixin, PrimaryM
    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()
-    status: BaseFilterLookup[Annotated['PowerFeedStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    status: Annotated['PowerFeedStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    type: BaseFilterLookup[Annotated['PowerFeedTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PowerFeedTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    supply: BaseFilterLookup[Annotated['PowerFeedSupplyEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    supply: Annotated['PowerFeedSupplyEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
-    phase: BaseFilterLookup[Annotated['PowerFeedPhaseEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    phase: Annotated['PowerFeedPhaseEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    voltage: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -816,34 +749,29 @@ class PowerFeedFilter(CabledObjectModelFilterMixin, TenancyFilterMixin, PrimaryM

@strawberry_django.filter_type(models.PowerOutlet, lookups=True)
 class PowerOutletFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['PowerOutletTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PowerOutletTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    power_port: Annotated['PowerPortFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
    power_port_id: ID | None = strawberry_django.filter_field()
-    feed_leg: BaseFilterLookup[Annotated['PowerOutletFeedLegEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    status: BaseFilterLookup[Annotated['PowerOutletStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    feed_leg: Annotated['PowerOutletFeedLegEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.PowerOutletTemplate, lookups=True)
 class PowerOutletTemplateFilter(ModularComponentModelFilterMixin):
-    type: BaseFilterLookup[Annotated['PowerOutletTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PowerOutletTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    power_port: Annotated['PowerPortTemplateFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
        strawberry_django.filter_field()
    )
    power_port_id: ID | None = strawberry_django.filter_field()
-    feed_leg: BaseFilterLookup[Annotated['PowerOutletFeedLegEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    feed_leg: Annotated['PowerOutletFeedLegEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )

@@ -863,7 +791,7 @@ class PowerPanelFilter(ContactFilterMixin, ImageAttachmentFilterMixin, PrimaryMo

@strawberry_django.filter_type(models.PowerPort, lookups=True)
 class PowerPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    maximum_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -876,7 +804,7 @@ class PowerPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterM

@strawberry_django.filter_type(models.PowerPortTemplate, lookups=True)
 class PowerPortTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    type: Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    maximum_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
@@ -889,7 +817,7 @@ class PowerPortTemplateFilter(ModularComponentTemplateFilterMixin):

@strawberry_django.filter_type(models.RackType, lookups=True)
 class RackTypeFilter(RackBaseFilterMixin):
-    form_factor: BaseFilterLookup[Annotated['RackFormFactorEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    form_factor: Annotated['RackFormFactorEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    manufacturer: Annotated['ManufacturerFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -898,13 +826,11 @@ class RackTypeFilter(RackBaseFilterMixin):
    manufacturer_id: ID | None = strawberry_django.filter_field()
    model: FilterLookup[str] | None = strawberry_django.filter_field()
    slug: FilterLookup[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()


@strawberry_django.filter_type(models.Rack, lookups=True)
 class RackFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMixin, RackBaseFilterMixin):
-    form_factor: BaseFilterLookup[Annotated['RackFormFactorEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    form_factor: Annotated['RackFormFactorEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    rack_type: Annotated['RackTypeFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
@@ -921,14 +847,12 @@ class RackFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMi
    location_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
-    status: BaseFilterLookup[Annotated['RackStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    status: Annotated['RackStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
    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()
-    airflow: BaseFilterLookup[Annotated['RackAirflowEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
+    airflow: Annotated['RackAirflowEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    vlan_groups: Annotated['VLANGroupFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
@@ -946,26 +870,17 @@ class RackReservationFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
    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()
-    status: BaseFilterLookup[Annotated['RackReservationStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )


@strawberry_django.filter_type(models.RackRole, lookups=True)
 class RackRoleFilter(OrganizationalModelFilterMixin):
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()


@strawberry_django.filter_type(models.RearPort, lookups=True)
 class RearPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin):
-    type: BaseFilterLookup[Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
    positions: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -973,12 +888,8 @@ class RearPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMi

@strawberry_django.filter_type(models.RearPortTemplate, lookups=True)
 class RearPortTemplateFilter(ModularComponentTemplateFilterMixin):
-    type: BaseFilterLookup[Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
-    color: BaseFilterLookup[Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()
    positions: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
    )
@@ -998,9 +909,7 @@ class RegionFilter(ContactFilterMixin, NestedGroupModelFilterMixin):
 class SiteFilter(ContactFilterMixin, ImageAttachmentFilterMixin, TenancyFilterMixin, PrimaryModelFilterMixin):
    name: FilterLookup[str] | None = strawberry_django.filter_field()
    slug: FilterLookup[str] | None = strawberry_django.filter_field()
-    status: BaseFilterLookup[Annotated['SiteStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None = (
-        strawberry_django.filter_field()
-    )
+    status: Annotated['SiteStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field()
    region: Annotated['RegionFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
    region_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
        strawberry_django.filter_field()
@@ -1057,9 +966,7 @@ class VirtualDeviceContextFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
    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()
-    status: (
-        BaseFilterLookup[Annotated['VirtualDeviceContextStatusEnum', strawberry.lazy('dcim.graphql.enums')]] | None
-    ) = (
+    status: Annotated['VirtualDeviceContextStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = (
        strawberry_django.filter_field()
    )
    identifier: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -5,13 +5,16 @@ import strawberry_django

 from core.graphql.mixins import ChangelogMixin
 from dcim import models
-from extras.graphql.mixins import ConfigContextMixin, ContactsMixin, ImageAttachmentsMixin
+from extras.graphql.mixins import (
+    ConfigContextMixin,
+    ContactsMixin,
+    CustomFieldsMixin,
+    ImageAttachmentsMixin,
+    TagsMixin,
+)
 from ipam.graphql.mixins import IPAddressesMixin, VLANGroupsMixin
 from netbox.graphql.scalars import BigInt
-from netbox.graphql.types import (
-    BaseObjectType, NestedGroupObjectType, NetBoxObjectType, OrganizationalObjectType, PrimaryObjectType,
-)
-from users.graphql.mixins import OwnerMixin
+from netbox.graphql.types import BaseObjectType, NetBoxObjectType, OrganizationalObjectType
 from .filters import *
 from .mixins import CabledObjectMixin, PathEndpointMixin

@@ -88,7 +91,12 @@ __all__ = (


@strawberry.type
-class ComponentType(OwnerMixin, NetBoxObjectType):
+class ComponentType(
+    ChangelogMixin,
+    CustomFieldsMixin,
+    TagsMixin,
+    BaseObjectType
+):
    """
    Base type for device/VM components
    """
@@ -151,7 +159,7 @@ class CableTerminationType(NetBoxObjectType):
    filters=CableFilter,
    pagination=True
 )
-class CableType(PrimaryObjectType):
+class CableType(NetBoxObjectType):
    color: str
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None

@@ -228,7 +236,7 @@ class ConsoleServerPortTemplateType(ModularComponentTemplateType):
    filters=DeviceFilter,
    pagination=True
 )
-class DeviceType(ConfigContextMixin, ImageAttachmentsMixin, ContactsMixin, PrimaryObjectType):
+class DeviceType(ConfigContextMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType):
    console_port_count: BigInt
    console_server_port_count: BigInt
    power_port_count: BigInt
@@ -331,7 +339,7 @@ class InventoryItemTemplateType(ComponentTemplateType):
    filters=DeviceRoleFilter,
    pagination=True
 )
-class DeviceRoleType(NestedGroupObjectType):
+class DeviceRoleType(OrganizationalObjectType):
    parent: Annotated['DeviceRoleType', strawberry.lazy('dcim.graphql.types')] | None
    children: List[Annotated['DeviceRoleType', strawberry.lazy('dcim.graphql.types')]]
    color: str
@@ -347,7 +355,7 @@ class DeviceRoleType(NestedGroupObjectType):
    filters=DeviceTypeFilter,
    pagination=True
 )
-class DeviceTypeType(PrimaryObjectType):
+class DeviceTypeType(NetBoxObjectType):
    console_port_template_count: BigInt
    console_server_port_template_count: BigInt
    power_port_template_count: BigInt
@@ -358,7 +366,6 @@ class DeviceTypeType(PrimaryObjectType):
    device_bay_template_count: BigInt
    module_bay_template_count: BigInt
    inventory_item_template_count: BigInt
-    device_count: BigInt
    front_image: strawberry_django.fields.types.DjangoImageType | None
    rear_image: strawberry_django.fields.types.DjangoImageType | None
    manufacturer: Annotated["ManufacturerType", strawberry.lazy('dcim.graphql.types')]
@@ -385,8 +392,7 @@ class DeviceTypeType(PrimaryObjectType):
 )
 class FrontPortType(ModularComponentType, CabledObjectMixin):
    color: str
-
-    mappings: List[Annotated["PortMappingType", strawberry.lazy('dcim.graphql.types')]]
+    rear_port: Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')]


@strawberry_django.type(
@@ -397,8 +403,7 @@ class FrontPortType(ModularComponentType, CabledObjectMixin):
 )
 class FrontPortTemplateType(ModularComponentTemplateType):
    color: str
-
-    mappings: List[Annotated["PortMappingTemplateType", strawberry.lazy('dcim.graphql.types')]]
+    rear_port: Annotated["RearPortTemplateType", strawberry.lazy('dcim.graphql.types')]


@strawberry_django.type(
@@ -407,7 +412,7 @@ class FrontPortTemplateType(ModularComponentTemplateType):
    filters=MACAddressFilter,
    pagination=True
 )
-class MACAddressType(PrimaryObjectType):
+class MACAddressType(NetBoxObjectType):
    mac_address: str

    @strawberry_django.field
@@ -507,7 +512,7 @@ class InventoryItemRoleType(OrganizationalObjectType):
    filters=LocationFilter,
    pagination=True
 )
-class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NestedGroupObjectType):
+class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, OrganizationalObjectType):
    site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
    parent: Annotated["LocationType", strawberry.lazy('dcim.graphql.types')] | None
@@ -550,7 +555,7 @@ class ManufacturerType(OrganizationalObjectType, ContactsMixin):
    filters=ModuleFilter,
    pagination=True
 )
-class ModuleType(PrimaryObjectType):
+class ModuleType(NetBoxObjectType):
    device: Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]
    module_bay: Annotated["ModuleBayType", strawberry.lazy('dcim.graphql.types')]
    module_type: Annotated["ModuleTypeType", strawberry.lazy('dcim.graphql.types')]
@@ -597,7 +602,7 @@ class ModuleBayTemplateType(ModularComponentTemplateType):
    filters=ModuleTypeProfileFilter,
    pagination=True
 )
-class ModuleTypeProfileType(PrimaryObjectType):
+class ModuleTypeProfileType(NetBoxObjectType):
    module_types: List[Annotated["ModuleType", strawberry.lazy('dcim.graphql.types')]]


@@ -607,8 +612,7 @@ class ModuleTypeProfileType(PrimaryObjectType):
    filters=ModuleTypeFilter,
    pagination=True
 )
-class ModuleTypeType(PrimaryObjectType):
-    module_count: BigInt
+class ModuleTypeType(NetBoxObjectType):
    profile: Annotated["ModuleTypeProfileType", strawberry.lazy('dcim.graphql.types')] | None
    manufacturer: Annotated["ManufacturerType", strawberry.lazy('dcim.graphql.types')]

@@ -628,7 +632,7 @@ class ModuleTypeType(PrimaryObjectType):
    filters=PlatformFilter,
    pagination=True
 )
-class PlatformType(NestedGroupObjectType):
+class PlatformType(OrganizationalObjectType):
    parent: Annotated['PlatformType', strawberry.lazy('dcim.graphql.types')] | None
    children: List[Annotated['PlatformType', strawberry.lazy('dcim.graphql.types')]]
    manufacturer: Annotated["ManufacturerType", strawberry.lazy('dcim.graphql.types')] | None
@@ -638,35 +642,13 @@ class PlatformType(NestedGroupObjectType):
    devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]]


-@strawberry_django.type(
-    models.PortMapping,
-    fields='__all__',
-    filters=PortMappingFilter,
-    pagination=True
-)
-class PortMappingType(ModularComponentTemplateType):
-    front_port: Annotated["FrontPortType", strawberry.lazy('dcim.graphql.types')]
-    rear_port: Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')]
-
-
-@strawberry_django.type(
-    models.PortTemplateMapping,
-    fields='__all__',
-    filters=PortTemplateMappingFilter,
-    pagination=True
-)
-class PortMappingTemplateType(ModularComponentTemplateType):
-    front_port: Annotated["FrontPortTemplateType", strawberry.lazy('dcim.graphql.types')]
-    rear_port: Annotated["RearPortTemplateType", strawberry.lazy('dcim.graphql.types')]
-
-
@strawberry_django.type(
    models.PowerFeed,
    exclude=['_path'],
    filters=PowerFeedFilter,
    pagination=True
 )
-class PowerFeedType(CabledObjectMixin, PathEndpointMixin, PrimaryObjectType):
+class PowerFeedType(NetBoxObjectType, CabledObjectMixin, PathEndpointMixin):
    power_panel: Annotated["PowerPanelType", strawberry.lazy('dcim.graphql.types')]
    rack: Annotated["RackType", strawberry.lazy('dcim.graphql.types')] | None
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
@@ -700,7 +682,7 @@ class PowerOutletTemplateType(ModularComponentTemplateType):
    filters=PowerPanelFilter,
    pagination=True
 )
-class PowerPanelType(ContactsMixin, PrimaryObjectType):
+class PowerPanelType(NetBoxObjectType, ContactsMixin):
    site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]
    location: Annotated["LocationType", strawberry.lazy('dcim.graphql.types')] | None

@@ -734,8 +716,7 @@ class PowerPortTemplateType(ModularComponentTemplateType):
    filters=RackTypeFilter,
    pagination=True
 )
-class RackTypeType(PrimaryObjectType):
-    rack_count: BigInt
+class RackTypeType(NetBoxObjectType):
    manufacturer: Annotated["ManufacturerType", strawberry.lazy('dcim.graphql.types')]


@@ -745,7 +726,7 @@ class RackTypeType(PrimaryObjectType):
    filters=RackFilter,
    pagination=True
 )
-class RackType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, PrimaryObjectType):
+class RackType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType):
    site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]
    location: Annotated["LocationType", strawberry.lazy('dcim.graphql.types')] | None
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
@@ -764,7 +745,7 @@ class RackType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, PrimaryObj
    filters=RackReservationFilter,
    pagination=True
 )
-class RackReservationType(PrimaryObjectType):
+class RackReservationType(NetBoxObjectType):
    units: List[int]
    rack: Annotated["RackType", strawberry.lazy('dcim.graphql.types')]
    tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
@@ -792,7 +773,7 @@ class RackRoleType(OrganizationalObjectType):
 class RearPortType(ModularComponentType, CabledObjectMixin):
    color: str

-    mappings: List[Annotated["PortMappingType", strawberry.lazy('dcim.graphql.types')]]
+    frontports: List[Annotated["FrontPortType", strawberry.lazy('dcim.graphql.types')]]


@strawberry_django.type(
@@ -804,7 +785,7 @@ class RearPortType(ModularComponentType, CabledObjectMixin):
 class RearPortTemplateType(ModularComponentTemplateType):
    color: str

-    mappings: List[Annotated["PortMappingTemplateType", strawberry.lazy('dcim.graphql.types')]]
+    frontport_templates: List[Annotated["FrontPortTemplateType", strawberry.lazy('dcim.graphql.types')]]


@strawberry_django.type(
@@ -813,7 +794,7 @@ class RearPortTemplateType(ModularComponentTemplateType):
    filters=RegionFilter,
    pagination=True
 )
-class RegionType(VLANGroupsMixin, ContactsMixin, NestedGroupObjectType):
+class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType):

    sites: List[Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]]
    children: List[Annotated["RegionType", strawberry.lazy('dcim.graphql.types')]]
@@ -839,7 +820,7 @@ class RegionType(VLANGroupsMixin, ContactsMixin, NestedGroupObjectType):
    filters=SiteFilter,
    pagination=True
 )
-class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, PrimaryObjectType):
+class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType):
    time_zone: str | None
    region: Annotated["RegionType", strawberry.lazy('dcim.graphql.types')] | None
    group: Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')] | None
@@ -874,7 +855,7 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, PrimaryObj
    filters=SiteGroupFilter,
    pagination=True
 )
-class SiteGroupType(VLANGroupsMixin, ContactsMixin, NestedGroupObjectType):
+class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType):

    sites: List[Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]]
    children: List[Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')]]
@@ -900,7 +881,7 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, NestedGroupObjectType):
    filters=VirtualChassisFilter,
    pagination=True
 )
-class VirtualChassisType(PrimaryObjectType):
+class VirtualChassisType(NetBoxObjectType):
    member_count: BigInt
    master: Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')] | None

@@ -913,7 +894,7 @@ class VirtualChassisType(PrimaryObjectType):
    filters=VirtualDeviceContextFilter,
    pagination=True
 )
-class VirtualDeviceContextType(PrimaryObjectType):
+class VirtualDeviceContextType(NetBoxObjectType):
    device: Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')] | None
    primary_ip4: Annotated["IPAddressType", strawberry.lazy('ipam.graphql.types')] | None
    primary_ip6: Annotated["IPAddressType", strawberry.lazy('ipam.graphql.types')] | None
--- a/netbox/dcim/management/commands/trace_paths.py
+++ b/netbox/dcim/management/commands/trace_paths.py
@@ -4,7 +4,7 @@ from django.db import connection
 from django.db.models import Q

 from dcim.models import CablePath, ConsolePort, ConsoleServerPort, Interface, PowerFeed, PowerOutlet, PowerPort
-from dcim.signals import create_cablepaths
+from dcim.signals import create_cablepath

 ENDPOINT_MODELS = (
    ConsolePort,
@@ -81,7 +81,7 @@ class Command(BaseCommand):
            self.stdout.write(f'Retracing {origins_count} cabled {model._meta.verbose_name_plural}...')
            i = 0
            for i, obj in enumerate(origins, start=1):
-                create_cablepaths([obj])
+                create_cablepath([obj])
                if not i % 100:
                    self.draw_progress_bar(i * 100 / origins_count)
            self.draw_progress_bar(100)
--- a/netbox/dcim/migrations/0216_latitude_longitude_validators.py
+++ b/netbox/dcim/migrations/0216_latitude_longitude_validators.py
@@ -1,67 +0,0 @@
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('dcim', '0215_rackreservation_status'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='device',
-            name='latitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=8,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(-90.0),
-                    django.core.validators.MaxValueValidator(90.0),
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='device',
-            name='longitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=9,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(-180.0),
-                    django.core.validators.MaxValueValidator(180.0),
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='site',
-            name='latitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=8,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(-90.0),
-                    django.core.validators.MaxValueValidator(90.0),
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='site',
-            name='longitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=9,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(-180.0),
-                    django.core.validators.MaxValueValidator(180.0),
-                ],
-            ),
-        ),
-    ]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeremy Stretch	4f2f61c90d	Reindex migrations	2025-10-24 15:25:45 -04:00
Jeremy Stretch	a34553325e	Add migrations to remove indexes and alter field collations	2025-10-24 15:23:58 -04:00
Jeremy Stretch	06052f8eaa	Use case-insensitive collations on fields considered for uniqueness	2025-10-24 15:23:58 -04:00
Jeremy Stretch	dac0a06f4f	Introduce case-insensitive collations	2025-10-24 15:23:58 -04:00