Merge branch 'hotfix/bug_fix'
fix hotkeys
Merge branch 'hotfix/hotkeys_not_working_on_launch' into staging