Merge "Add comments for two SVC related controls"