Bug#1036631: still exists in bookworm

[Manuel Traut]

Hi Craig,

The bug is not fixed in bookworm.

Can you please pick the attached patches for stable?

Greetings
Manuel