Mep release13052020 fix breaking changes

Merged Akshay Bharambe requested to merge MEP_Release13052020_FIX into staging

There are currently no pipelines.

To run a merge request pipeline, the jobs in the CI/CD configuration file must be configured to run in merge request pipelines.