@gsmet is it ok for me to target the 2.2 branch directly for such cases, or do you prefer a different workflow?

We don't want to have this in `main` as it transitioned to 5.6 - as we discussed earlier.