Merge "Use enum class for tool type"