Bringing sat-comp-2022 up-to-date with master prior to refactor.

[mww-aws]

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.