Merge "Fixing mso-simulator patching"