this PR contains the changes for an QA-team upload to stable (buster) to fix https://bugs.debian.org/935816