Merge "SF Tracing: Provide a valid starting bounds" into tm-dev