Merge "Update shortcuts to match spec"