[[ Bug 12370 ]] Make sure key codes are mapped correctly.
Merge branch 'bugfix-12370' into develop