shortcuts on editor level by use of `-shortcut-view`
Merge branch 'master' into shortcuts-rebase