Closes #

<!-- Repeat this line for each resolved issue, up to 20. Remove the placeholder only if no issue is resolved and the approval gate does not apply. -->

## Summary

<!-- State what changes and why. -->

## Correctness and risk

<!-- State why the change is correct, the invariants it preserves, and what fails if it is wrong. -->

## Verification

<!-- List the commands and manual checks performed. State anything not verified. -->