We suspect there may be one or two other bits that should be backported. We should investigate whether any high-impact fixes should be included in this epic. Output of investigation is a list of possible things and the impact of backporting (or not)
Things that came to mind when writing this ticket: