Hi, I have created a new MP in Salsa to re-consider these changes. I have updated and cleared a lot, but also skipped the mass enabling for now to focus on the rest of the changes first. Please see: https://salsa.debian.org/debian/strongswan/merge_requests/5