Merge "Adding feature flag for MEP APIs"