Merge pull request #147 from Mirantis/mall_switch_model_fixes

mall fixes