Description of PR

THIS IS A CLEAN VERSION OF APPROVED PR #327

In fixing an issue in #327, the branch diverged too far from main. Was reset back to an older commit and fixed.

Summary of changes and related issue

Relevant motivation and context

Dependencies required for this change?

Fixes # (issue), delete if not necessary

Type of change

[x] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
[ ] This change requires a documentation update

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.

[x] My code follows the style guidelines of this project
[x] I have performed a self-review of my code
[x] I have commented my code, particularly in hard-to-understand areas
[x] I have made corresponding changes to the documentation
[x] My changes generate no new warnings
[N/A] I have added tests that prove my fix is effective or that my feature works
[N/A] New and existing unit tests pass locally with my changes
[x] Any dependent changes have been merged and published in downstream modules