merge

Shortcut fix merged.