Merge "Changed TransactionProfiler to only work via the DB classes"