update EAP IDEA
Merge branch 'master' into extended