Rebase to https://github.com/ostreedev/ostree/releases/tag/v2023.5
adding this backport to the rebase https://github.com/ostreedev/ostree/commit/7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f
*** Bug 2230059 has been marked as a duplicate of this bug. ***