Changes to fix MMS in v2.1
Merge pull request #536 from owdqa/bug/fix_mms_v2.1

Changes to fix MMS in v2.1