Mep release13052020 fix breaking changes

Merged Akshay Bharambe requested to merge MEP_Release13052020_FIX into staging
  1. May 13, 2020