merge master to silicon hotkeys