[FROG] DMVPN(nhrpd) status question

Hello. According to nhrpd docs (http://docs.frrouting.org/en/latest/nhrpd.html) need to patches strongswan to work together with frr/nhrpd but this document has date 2017. Is it still need to apply thous patches on strongswan or fresh versions of FRR and strongswan will work together out of the box now ? B.t.w. 1 month ago I tried to set up nhrp network without ipsec but all traffic went through hubs. I did not try to use strongswan due to need to apply this patch (I don't like patched software on docker containers, it is hard to support it then)