Project updated to the latest state of MPS 3.0 sources from master