Merge "SF: cleanup VSP traces"