Merge "Correct Service Type value"