Merge "Add ids to transactions and dump them in transaction trace"