Merge pull request #1806 from candlerb/v3.0.x/candlerb/eap-updated