upstream/6.3+20220423

Sven Joachim

@joachim-guest

a0bc708b · Import upstream patch 20220423 · Apr 24, 2022

Upstream patchlevel 6.3+20220423