Merge "Refactor get_health_service"