Merge "Made TransactionProfiler handle interlaced transactions better"