upstream/6.4+20230625

Sven Joachim

@joachim-guest

964ec9f9 · Import upstream patch 20230625 · Jun 26, 2023

Upstream patchlevel 6.4+20230625