Fixes for MMS in Flame
Merge branch 'integration-v2.0' into bug/fix_mms_flame
Fixes for SMS and MMS tests in flame
Changes from PR437 and more
Restore testvars
Merge pull request #437 from owdqa/bug/fix_mms_flame

Fixes for MMS in Flame