#9273: Shortcut changes