EAP6-13: Preliminary support integration