Merge "Convert tool type to enum class" into udc-dev