Merge "Shortcut crash fix" into main