Fix escape of keymappings
Merge branch 'fix-keymapping-escape' into dev
Merge branch 'dev'