Merge "Bugfix for svc."