Merge "define mep feature flags" into tm-dev