#8 Add support for EAP 6.1.1