Merge from pirog

[pirog]

Thank you so much for contributing code to hyperdrive!

We will get to your PR as soon as we can but in the meantime you might want to check to make sure you have done the following. The more boxes you can check the easier it will be for us to merge in your changes with confidence

• [x] My code includes an update to the CHANGELOG
• [x] My code includes documentation updates if applicable.
• [x] My code passes relevant CI status checks
• [x] I have pinged a project committer when I think my code is ready for prime time.

If you are unclear about any of the above please add comments below so we can improve our process.