Merge "Use enum class for InputMessage type"