Update to 3.1 EAP2
Clarify dependency on MPS 3.1
Merge with remote