merge upstream
authorRedacted <redacted@no-reply.carvel.li>
Mon, 10 Mar 2025 17:23:18 +0000 (17:23 +0000)
committerRedacted <redacted@no-reply.carvel.li>
Mon, 10 Mar 2025 17:23:18 +0000 (17:23 +0000)

Trivial merge