Merge "better defualt behaviour for msim" into oc-dev