merge upstream
authorFriendly <friendly@no-reply.carvel.li>
Wed, 18 Jun 2025 10:02:23 +0000 (10:02 +0000)
committerFriendly <friendly@no-reply.carvel.li>
Wed, 18 Jun 2025 10:02:23 +0000 (10:02 +0000)

Trivial merge