merged multi2sim-4.1 modification (4.2)