Changes for MMS fixes
Merge pull request #444 from owdqa/bug/fix_mms_v20

Changes for MMS fixes