RTGOV-402
RTGOV-391 EAP 6.1 -> EAP 6.x