Upgrade to MPS 3.1  RC2