Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>
- Fixes: #1541 - Fixes: #1594 Signed-off-by: Jonathon Anderson <janderson@ciq.com>