Merge "Convert validatekeymaps to enum class"