Merge branch '21617-fed-content'
authorTom Clegg <tom@curii.com>
Fri, 29 Mar 2024 20:39:09 +0000 (16:39 -0400)
committerTom Clegg <tom@curii.com>
Fri, 29 Mar 2024 20:39:09 +0000 (16:39 -0400)
fixes #21617
fixes #21533

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>


Trivial merge