Merge "SVC improvements"