Merge "fix shortcut handling"