upstream/6.4+20230603

Sven Joachim

@joachim-guest

e29a4595 · Import upstream patch 20230603 · Jun 04, 2023

Upstream patchlevel 6.4+20230603