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