Merge pull request #22244 from tiagogaspar8/strongswan_replay