Hi Martin,
For now, I would recommend doing 1:1 backports. Otherwise, you'll need to merge all ChangeLog entries in a format the server hook accepts. That can require somework.
If the first commit caused a regression, which the second one fixed, this would keep the first regression, right? Is that what we want? Regards Thomas