[[ Bug 12681 ]] Tweaks to ensure keypad keys come through correctly to the engine.
Merge branch 'bugfix-12681' into develop