Merge "Revert "Merge "SVC improvements"""