Merge "remove throwing ServiceSpecificException"