Merging Time Independent Trace Replay and ScalaTrace