merge upstream
authorCensored <censored@no-reply.carvel.li>
Thu, 12 Jun 2025 16:23:13 +0000 (16:23 +0000)
committerCensored <censored@no-reply.carvel.li>
Thu, 12 Jun 2025 16:23:13 +0000 (16:23 +0000)

Trivial merge