Hotfix bug in keyboard shortcut handling
Merge branch 'dev' into release-beta