Issues 449, 521, 525, 526: Catch `develop-2.0.0` up to `develop`

[ajnelson-nist]

This is part of resolving #449, #521, #525, and #526 .

Coordination

• [x] Pull Request is against correct branch
• [x] Pull Request is in Draft status before CI has passed
• [x] CI passes in UCO feature branch against develop-2.0.0
• [x] Milestone linked

[ajnelson-nist]

This is ready to be merged.