Merge "Fix SF presenter not recognising VC traces." into main