Correct and simplify delivered ids

[#52935333]
[Delivers #52935333]

* borked-52935333:
  Correct and simplify delivered ids
Include ids of delivered bugs

[#52935581]
[Delivers #52935581]

* include-bugs-52935581:
  Include ids of delivered bugs