Merge pull request #19233 from jempatel/improve_libreswan-uci