Merge "VSPERF: Tagging for 7.0.0"