Merge "SF: Add mirror layers to transaction trace"