AGPUSH-765: Replace EAP with MP