Merge pull request #18262 from TDT-AG/pr/20220406-strongswan