Tasks: - [ ] Familiarize with #9860 - [ ] Drive #9860 to completion - [ ] Run any non-CI tests that may be needed DoD: * Patch finalized, reviewed, approved, and merged