Merge "remove SVC" into nextgenv2