Merge "better defualt behaviour for msim"