Merge changes Ib64227a0,I8bfcf23c,I037e4021

* changes:
  SF: Update static sequence counter when injecting a sequence number
  SF: Fix transaction trace merging
  SF: Add new fields to transactions proto