BUG: 488219
(cherry picked from commit 83df60b7)
Co-authored-by: Matthias Klumpp matthias@tenstral.net