Merge "Correct path for service-instance"