migrated core.base to mps 3.0 -- continued