Fix in mainline merge with evpn-devel