Merge pull request #1751 from jrouzierinverse/feature/eap-fast-3.0.x