Unified behaviour with corporate/non-corporate sims in MMS
Merge pull request #523 from owdqa/bug/non_corp_sims

Unified behaviour with corporate/non-corporate sims in MMS