Merge main into astrom_e2e branch

[manduhmia]

Describe your changes

Type of change

Please delete options that are not relevant (and this line).

• 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)

Reference any relevant issues (don't forget the #)

Checklist before requesting a review

• I have linted my code
• I have verified that all unit tests pass in a clean environment and added new unit tests, as needed
• I have verified that all docstrings are properly formatted and added new documentation, as needed
• I have filled out the Unit Test Definition Table on confluence, as needed