Merge "Convert tool type to enum class"