Tasks: - [ ] Familiarize with PR #9801 - [ ] Drive it to completion, including any non-CI testing needed DoD: - #9801 approved, tested, and merged