updated for EAP 6.3 GA