upstream/6.4+20240113

Sven Joachim

@joachim-guest

9424642e · Import upstream patch 20240113 · Jan 14, 2024

Upstream patchlevel 6.4+20240113