upstream/6.5+20250125

Sven Joachim

@joachim-guest

fe08fb7b · Import upstream patch 20250125 · Jan 26, 2025

Upstream patchlevel 6.5+20250125