merge upstream
authorCensored <censored@no-reply.carvel.li>
Wed, 11 Jun 2025 19:46:49 +0000 (19:46 +0000)
committerCensored <censored@no-reply.carvel.li>
Wed, 11 Jun 2025 19:46:49 +0000 (19:46 +0000)

Trivial merge