#23 Adding support for EAP 6.2.1