The pull request looks correct to me. Thank you Gabriele Comoretto [X].
Using Github I tried comparing master with the tickets/
DM-18332-backporting branch and I am puzzled why they are not the same. This probably shows my unfamiliarity with the backporting procedure. When I examine the affected files individually in the different branches, everything is just as I expect.