Closes #2504

Status

READY

Does this PR contain migrations?

NO

Before You Submit Your PR:

• Have you announced your PR on the comixed-dev mailing list?
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Refactors existing code (code changes for efficiency or maintainability)
• Updates runtime dependencies but does not add new functionality
• Security fix (be sure to include the CVE in the commit message)
• Breaking change (fix or feature that would cause existing functionality to change)
• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.