Merge "Finalize MEP functionality." into nyc-mr1-dev