minor changes for keyboard shortcuts
Merge branch 'key-master' into km-stage
Merge branch 'km-stage' into staging