Merge "SF: Introduce LayerTraceGenerator" into tm-dev