Issues 508, 509: Catch develop-2.0.0 up to develop

[ajnelson-nist]

This is part of resolving #508 and #509.

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]

@b0bkaT , once CI passes, can you please merge this PR?