Merge "[sf] Fix override flag in TransactionTraceWriter" into main