merge: integrate upstream changes

This commit is contained in:
Codex 2025-06-07 00:34:07 +00:00 committed by Slipstream
commit 3a1ac5f518
Signed by: slipstream
GPG Key ID: 13E498CE010AC6FD

Diff Content Not Available