diff --git a/examples/s2-next-macros/src/app/page.tsx b/examples/s2-next-macros/src/app/page.tsx
index 44456c9bf0e..536b5a2cb78 100644
--- a/examples/s2-next-macros/src/app/page.tsx
+++ b/examples/s2-next-macros/src/app/page.tsx
@@ -23,9 +23,13 @@ import {
   ButtonGroup,
   Cell,
   Column,
+  Content,
+  ContextualHelpPopover,
   Divider,
   Heading,
   LinkButton,
+  ListView,
+  ListViewItem,
   Menu,
   MenuItem,
   MenuTrigger,
@@ -43,7 +47,8 @@ import {
   ToggleButtonGroup,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  UnavailableMenuItemTrigger
 } from "@react-spectrum/s2";
 import Edit from "@react-spectrum/s2/icons/Edit";
 import FileTxt from "@react-spectrum/s2/icons/FileText";
@@ -170,7 +175,13 @@ function App() {
                   <MenuItem id="sms">SMS</MenuItem>
                 </Menu>
               </SubmenuTrigger>
-              <MenuItem id="delete">Delete</MenuItem>
+              <UnavailableMenuItemTrigger isUnavailable>
+                <MenuItem id="delete">Delete</MenuItem>
+                <ContextualHelpPopover>
+                  <Heading slot="title">Permission required</Heading>
+                  <Content>Contact your administrator for permissions to delete.</Content>
+                </ContextualHelpPopover>
+              </UnavailableMenuItemTrigger>
             </Menu>
           </MenuTrigger>
           <MenuTrigger>
@@ -184,6 +195,23 @@ function App() {
               <MenuItem>Paste</MenuItem>
             </Menu>
           </MenuTrigger>
+          <ListView
+            aria-label="Files"
+            selectionMode="multiple"
+            styles={style({width: 320, height: 320})}>
+            <ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
+              <Text>Adobe Photoshop</Text>
+              <Text slot="description">Image editing software</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-xd" textValue="Adobe XD">
+              <Text>Adobe XD</Text>
+              <Text slot="description">UI/UX design tool</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-indesign" textValue="Adobe InDesign">
+              <Text>Adobe InDesign</Text>
+              <Text slot="description">Desktop publishing</Text>
+            </ListViewItem>
+          </ListView>
           <TableView
             aria-label="Files"
             styles={style({width: 320, height: 320})}
diff --git a/examples/s2-parcel-example/src/App.js b/examples/s2-parcel-example/src/App.js
index 5d214e1d9a5..b3148bee566 100644
--- a/examples/s2-parcel-example/src/App.js
+++ b/examples/s2-parcel-example/src/App.js
@@ -21,9 +21,13 @@ import {
   ButtonGroup,
   Cell,
   Column,
+  Content,
+  ContextualHelpPopover,
   Divider,
   Heading,
   LinkButton,
+  ListView,
+  ListViewItem,
   Menu,
   MenuItem,
   MenuTrigger,
@@ -41,7 +45,8 @@ import {
   ToggleButtonGroup,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  UnavailableMenuItemTrigger
 } from "@react-spectrum/s2";
 import Edit from "@react-spectrum/s2/icons/Edit";
 import FileTxt from "@react-spectrum/s2/icons/FileText";
@@ -168,7 +173,13 @@ function App() {
                   <MenuItem id="sms">SMS</MenuItem>
                 </Menu>
               </SubmenuTrigger>
-              <MenuItem id="delete">Delete</MenuItem>
+              <UnavailableMenuItemTrigger isUnavailable>
+                <MenuItem id="delete">Delete</MenuItem>
+                <ContextualHelpPopover>
+                  <Heading slot="title">Permission required</Heading>
+                  <Content>Contact your administrator for permissions to delete.</Content>
+                </ContextualHelpPopover>
+              </UnavailableMenuItemTrigger>
             </Menu>
           </MenuTrigger>
           <MenuTrigger>
@@ -182,6 +193,23 @@ function App() {
               <MenuItem>Paste</MenuItem>
             </Menu>
           </MenuTrigger>
+          <ListView
+            aria-label="Files"
+            selectionMode="multiple"
+            styles={style({width: 320, height: 320})}>
+            <ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
+              <Text>Adobe Photoshop</Text>
+              <Text slot="description">Image editing software</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-xd" textValue="Adobe XD">
+              <Text>Adobe XD</Text>
+              <Text slot="description">UI/UX design tool</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-indesign" textValue="Adobe InDesign">
+              <Text>Adobe InDesign</Text>
+              <Text slot="description">Desktop publishing</Text>
+            </ListViewItem>
+          </ListView>
           <TableView
             aria-label="Files"
             styles={style({width: 320, height: 320})}
diff --git a/examples/s2-webpack-5-example/src/App.js b/examples/s2-webpack-5-example/src/App.js
index ae32bf391cc..63d4e7ff9c2 100644
--- a/examples/s2-webpack-5-example/src/App.js
+++ b/examples/s2-webpack-5-example/src/App.js
@@ -21,9 +21,13 @@ import {
   ButtonGroup,
   Cell,
   Column,
+  Content,
+  ContextualHelpPopover,
   Divider,
   Heading,
   LinkButton,
+  ListView,
+  ListViewItem,
   Menu,
   MenuItem,
   MenuTrigger,
@@ -41,7 +45,8 @@ import {
   ToggleButtonGroup,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  UnavailableMenuItemTrigger
 } from "@react-spectrum/s2";
 import Edit from "@react-spectrum/s2/icons/Edit";
 import FileTxt from "@react-spectrum/s2/icons/FileText";
@@ -168,7 +173,13 @@ function App() {
                   <MenuItem id="sms">SMS</MenuItem>
                 </Menu>
               </SubmenuTrigger>
-              <MenuItem id="delete">Delete</MenuItem>
+              <UnavailableMenuItemTrigger isUnavailable>
+                <MenuItem id="delete">Delete</MenuItem>
+                <ContextualHelpPopover>
+                  <Heading slot="title">Permission required</Heading>
+                  <Content>Contact your administrator for permissions to delete.</Content>
+                </ContextualHelpPopover>
+              </UnavailableMenuItemTrigger>
             </Menu>
           </MenuTrigger>
           <MenuTrigger>
@@ -182,6 +193,23 @@ function App() {
               <MenuItem>Paste</MenuItem>
             </Menu>
           </MenuTrigger>
+          <ListView
+            aria-label="Files"
+            selectionMode="multiple"
+            styles={style({width: 320, height: 320})}>
+            <ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
+              <Text>Adobe Photoshop</Text>
+              <Text slot="description">Image editing software</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-xd" textValue="Adobe XD">
+              <Text>Adobe XD</Text>
+              <Text slot="description">UI/UX design tool</Text>
+            </ListViewItem>
+            <ListViewItem id="adobe-indesign" textValue="Adobe InDesign">
+              <Text>Adobe InDesign</Text>
+              <Text slot="description">Desktop publishing</Text>
+            </ListViewItem>
+          </ListView>
           <TableView
             aria-label="Files"
             styles={style({width: 320, height: 320})}
diff --git a/packages/@internationalized/date/src/index.ts b/packages/@internationalized/date/src/index.ts
index 02752a6045d..5d373c842f1 100644
--- a/packages/@internationalized/date/src/index.ts
+++ b/packages/@internationalized/date/src/index.ts
@@ -66,7 +66,6 @@ export {
   getLocalTimeZone,
   setLocalTimeZone,
   resetLocalTimeZone,
-  isLocalTimeZoneOverridden,
   startOfMonth,
   startOfWeek,
   startOfYear,
diff --git a/packages/@internationalized/date/tests/queries.test.js b/packages/@internationalized/date/tests/queries.test.js
index a80166ed0db..cb9f5b553ca 100644
--- a/packages/@internationalized/date/tests/queries.test.js
+++ b/packages/@internationalized/date/tests/queries.test.js
@@ -25,7 +25,6 @@ import {
   isEqualMonth,
   isEqualYear,
   IslamicUmalquraCalendar,
-  isLocalTimeZoneOverridden,
   isSameDay,
   isSameMonth,
   isSameYear,
@@ -40,6 +39,8 @@ import {
   startOfYear,
   ZonedDateTime
 } from '..';
+import {isLocalTimeZoneOverridden} from '../src/queries';
+
 
 describe('queries', function () {
   describe('isSameDay', function () {
diff --git a/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts b/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts
index 7fbec801b48..d10c797d525 100644
--- a/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts
+++ b/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts
@@ -58,12 +58,7 @@ function nextDropTarget(
     } else {
       nextKey = keyboardDelegate.getKeyBelow?.(target.key);
     }
-    let nextCollectionKey = collection.getKeyAfter(target.key);
-    let nextCollectionNode = nextCollectionKey && collection.getItem(nextCollectionKey);
-    while (nextCollectionNode && nextCollectionNode.type === 'content') {
-      nextCollectionKey = nextCollectionKey ? collection.getKeyAfter(nextCollectionKey) : null;
-      nextCollectionNode = nextCollectionKey && collection.getItem(nextCollectionKey);
-    }
+    let nextCollectionKey = getNextItem(collection, target.key, key => collection.getKeyAfter(key));
 
     // If the keyboard delegate did not move to the next key in the collection,
     // jump to that key with the same drop position. Otherwise, try the other
@@ -191,7 +186,7 @@ function previousDropTarget(
     } else {
       prevKey = keyboardDelegate.getKeyAbove?.(target.key);
     }
-    let prevCollectionKey = collection.getKeyBefore(target.key);
+    let prevCollectionKey = getNextItem(collection, target.key, key => collection.getKeyBefore(key));
 
     // If the keyboard delegate did not move to the next key in the collection,
     // jump to that key with the same drop position. Otherwise, try the other
@@ -263,7 +258,7 @@ function getLastChild(collection: Collection<Node<unknown>>, key: Key): DropTarg
   // getChildNodes still returns child tree items even when the item is collapsed.
   // Checking if the next item has a greater level is a silly way to determine if the item is expanded.
   let targetNode = collection.getItem(key);
-  let nextKey = collection.getKeyAfter(key);
+  let nextKey = getNextItem(collection, key, key => collection.getKeyAfter(key));
   let nextNode = nextKey != null ? collection.getItem(nextKey) : null;
   if (targetNode && nextNode && nextNode.level > targetNode.level) {
     let children = getChildNodes(targetNode, collection);
@@ -285,3 +280,14 @@ function getLastChild(collection: Collection<Node<unknown>>, key: Key): DropTarg
 
   return null;
 }
+
+// Find the next or previous item in a collection, skipping over other types of nodes (e.g. content).
+function getNextItem(collection: Collection<Node<unknown>>, key: Key, getNextKey: (key: Key) => Key | null): Key | null {
+  let nextCollectionKey = getNextKey(key);
+  let nextCollectionNode = nextCollectionKey != null ? collection.getItem(nextCollectionKey) : null;
+  while (nextCollectionNode && nextCollectionNode.type !== 'item') {
+    nextCollectionKey = getNextKey(nextCollectionNode.key);
+    nextCollectionNode = nextCollectionKey != null ? collection.getItem(nextCollectionKey) : null;
+  }
+  return nextCollectionKey;
+}
diff --git a/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx b/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx
index bbf7a1c09dc..1fddd436602 100644
--- a/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx
+++ b/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx
@@ -48,7 +48,7 @@ class TestCollection implements Collection<Node<Item>> {
   constructor(items: Item[]) {
     this.map = new Map<Key, Node<Item>>();
     let visitItem = (item: Item, index: number, level = 0, parentKey: string | null = null): Node<Item> => {
-      let childNodes = item.childItems ? visitItems(item.childItems, level + 1, item.id) : [];
+      let childNodes = visitItems(item.childItems ?? [], level + 1, item.id);
       return {
         type: 'item',
         key: item.id,
@@ -67,6 +67,24 @@ class TestCollection implements Collection<Node<Item>> {
       let last: Node<Item> | null = null;
       let index = 0;
       let nodes: Node<Item>[] = [];
+      if (parentKey != null) {
+        let contentNode = {
+          type: 'content',
+          key: parentKey + '-content',
+          value: null,
+          level: level,
+          hasChildNodes: false,
+          childNodes: [],
+          rendered: null,
+          textValue: '',
+          index: index++,
+          parentKey
+        };
+        this.map.set(contentNode.key, contentNode);
+        nodes.push(contentNode);
+        last = contentNode;
+      }
+
       for (let item of items) {
         let node = visitItem(item, index, level, parentKey);
         this.map.set(item.id, node);
@@ -236,25 +254,45 @@ describe('drop target keyboard navigation', () => {
 
     let expectedKeys = [
       'projects',
+      'projects-content',
       'project-1',
+      'project-1-content',
       'project-2',
+      'project-2-content',
       'project-2A',
+      'project-2A-content',
       'project-2B',
+      'project-2B-content',
       'project-2C',
+      'project-2C-content',
       'project-3',
+      'project-3-content',
       'project-4',
+      'project-4-content',
       'project-5',
+      'project-5-content',
       'project-5A',
+      'project-5A-content',
       'project-5B',
+      'project-5B-content',
       'project-5C',
+      'project-5C-content',
       'reports',
+      'reports-content',
       'reports-1',
+      'reports-1-content',
       'reports-1A',
+      'reports-1A-content',
       'reports-1AB',
+      'reports-1AB-content',
       'reports-1ABC',
+      'reports-1ABC-content',
       'reports-1B',
+      'reports-1B-content',
       'reports-1C',
-      'reports-2'
+      'reports-1C-content',
+      'reports-2',
+      'reports-2-content'
     ];
     
     expect(nextKeys).toEqual(expectedKeys);
diff --git a/packages/@react-aria/interactions/src/focusSafely.ts b/packages/@react-aria/interactions/src/focusSafely.ts
index cd171d34950..8164ad90893 100644
--- a/packages/@react-aria/interactions/src/focusSafely.ts
+++ b/packages/@react-aria/interactions/src/focusSafely.ts
@@ -24,6 +24,10 @@ import {getInteractionModality} from './useFocusVisible';
  * as page scrolling and screen reader issues with CSS transitions.
  */
 export function focusSafely(element: FocusableElement): void {
+  if (!element.isConnected) {
+    return;
+  }
+
   // If the user is interacting with a virtual cursor, e.g. screen reader, then
   // wait until after any animated transitions that are currently occurring on
   // the page before shifting focus. This avoids issues with VoiceOver on iOS
diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx
index 51247090172..32bbeb3feb8 100644
--- a/packages/@react-spectrum/s2/src/ComboBox.tsx
+++ b/packages/@react-spectrum/s2/src/ComboBox.tsx
@@ -369,7 +369,7 @@ export const ComboBox = /*#__PURE__*/ (forwardRef as forwardRefType)(function Co
   );
 });
 
-export interface ComboBoxItemProps extends Omit<ListBoxItemProps, 'children' | 'style' | 'className' | 'render' | 'onClick' | keyof GlobalDOMAttributes>, StyleProps {
+export interface ComboBoxItemProps extends Omit<ListBoxItemProps, 'children' | 'style' | 'className' | 'render' | 'onClick' | 'onKeyDown' | 'onKeyUp' | keyof GlobalDOMAttributes>, StyleProps {
   children: ReactNode
 }
 
diff --git a/packages/@react-spectrum/s2/src/ContextualHelp.tsx b/packages/@react-spectrum/s2/src/ContextualHelp.tsx
index 6d445704021..8f9e20eb039 100644
--- a/packages/@react-spectrum/s2/src/ContextualHelp.tsx
+++ b/packages/@react-spectrum/s2/src/ContextualHelp.tsx
@@ -1,11 +1,11 @@
 import {ActionButton} from './ActionButton';
 import {AriaLabelingProps, DOMProps, FocusableRef, FocusableRefValue} from '@react-types/shared';
 import {ContentContext, FooterContext, HeadingContext, TextContext as SpectrumTextContext} from './Content';
-import {ContextValue, DEFAULT_SLOT, Provider, Dialog as RACDialog, TextContext} from 'react-aria-components';
+import {ContextValue, DEFAULT_SLOT, Provider, TextContext} from 'react-aria-components';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {dialogInner} from './Dialog';
 import {DialogTrigger, DialogTriggerProps} from './DialogTrigger';
-import {filterDOMProps, mergeProps, useLabels, useSlotId} from '@react-aria/utils';
+import {filterDOMProps, mergeProps, useId, useLabels} from '@react-aria/utils';
 import HelpIcon from '../s2wf-icons/S2_Icon_HelpCircle_20_N.svg';
 import InfoIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
 // @ts-ignore
@@ -44,16 +44,18 @@ const headingStyles = style({
  */
 export function ContextualHelpPopover(props: ContextualHelpPopoverProps) {
   let {children, ...popoverProps} = props;
-  let titleId = useSlotId();
+  let titleId = useId();
+
   return (
     <Popover
       padding="none"
       hideArrow
+      aria-labelledby={titleId}
       {...popoverProps}>
       <div
         className={wrappingDiv}>
-        <RACDialog
-          aria-labelledby={titleId}
+        <div
+
           className={mergeStyles(dialogInner, style({borderRadius: 'none', margin: 'calc(self(paddingTop) * -1)', padding: 24}))}>
           <Provider
             values={[
@@ -71,7 +73,7 @@ export function ContextualHelpPopover(props: ContextualHelpPopoverProps) {
                   // ContextualHelp (they get the aria-labelled by from the button)
                   // otherwise, use the heading if available aka unavaiable menu item
                   [DEFAULT_SLOT]: {styles: headingStyles},
-                  title: {id: titleId, styles: headingStyles}
+                  title: {id: titleId, styles: headingStyles, level: 2}
                 }
               }],
               [ContentContext, {styles: style({
@@ -84,7 +86,7 @@ export function ContextualHelpPopover(props: ContextualHelpPopoverProps) {
             ]}>
             {children}
           </Provider>
-        </RACDialog>
+        </div>
       </div>
     </Popover>
   );
diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx
index 85a9d79c19c..fac45b68db6 100644
--- a/packages/@react-spectrum/s2/src/TableView.tsx
+++ b/packages/@react-spectrum/s2/src/TableView.tsx
@@ -947,21 +947,13 @@ const commonCellStyles = {
   borderXWidth: 0,
   borderStyle: 'solid',
   position: 'relative',
-  color: {
-    default: 'gray-800',
-    forcedColors: 'ButtonText'
-  },
+  color: '--rowTextColor',
   outlineStyle: 'none',
   paddingX: 16 // table-edge-to-content
 } as const;
 
 const cell = style<CellRenderProps & S2TableProps & {isDivider: boolean}>({
   ...commonCellStyles,
-  color: {
-    default: baseColor('neutral-subdued'),
-    isSelected: baseColor('neutral'),
-    forcedColors: 'ButtonText'
-  },
   paddingY: centerPadding(),
   minHeight: {
     default: 40,
@@ -1398,6 +1390,16 @@ const rowBackgroundColor = {
   }
 } as const;
 
+const rowTextColor = {
+  default: baseColor('neutral-subdued'),
+  isSelected: baseColor('neutral'),
+  isDisabled: {
+    default: 'disabled',
+    forcedColors: 'GrayText'
+  },
+  forcedColors: 'ButtonText'
+} as const;
+
 const row = style<RowRenderProps & S2TableProps>({
   height: 'full',
   position: 'relative',
@@ -1407,6 +1409,10 @@ const row = style<RowRenderProps & S2TableProps>({
     type: 'backgroundColor',
     value: rowBackgroundColor
   },
+  '--rowTextColor': {
+    type: 'color',
+    value: rowTextColor
+  },
   '--rowFocusIndicatorColor': {
     type: 'outlineColor',
     value: {
@@ -1451,6 +1457,13 @@ const row = style<RowRenderProps & S2TableProps>({
   forcedColorAdjust: 'none'
 });
 
+const selectionCheckbox = style({
+  visibility: {
+    default: 'visible',
+    ':is([slot="selection"][data-disabled="true"])': 'hidden'
+  }
+});
+
 export interface RowProps<T> extends Pick<RACRowProps<T>, 'id' | 'columns' | 'isDisabled' | 'onAction' | 'children' | 'textValue' | 'dependencies' | keyof GlobalDOMAttributes>, LinkDOMProps {}
 
 /**
@@ -1477,7 +1490,7 @@ export const Row = /*#__PURE__*/ (forwardRef as forwardRefType)(function Row<T e
         // The `spread` otherProps must be after className in Cell.
         // @ts-ignore
         <Cell isSticky className={checkboxCellStyle}>
-          <Checkbox slot="selection" />
+          <Checkbox slot="selection" styles={selectionCheckbox} />
         </Cell>
       )}
       <Collection items={columns} dependencies={[...dependencies, columns]}>
diff --git a/packages/@react-types/combobox/src/index.d.ts b/packages/@react-types/combobox/src/index.d.ts
index 3eefa51123e..7a00ecf44f6 100644
--- a/packages/@react-types/combobox/src/index.d.ts
+++ b/packages/@react-types/combobox/src/index.d.ts
@@ -71,7 +71,7 @@ export interface ComboBoxProps<T, M extends SelectionMode = 'single'> extends Co
    * The initial selected key in the collection (uncontrolled).
    * @deprecated
    */
-  defaultSelectedKey?: Key,
+  defaultSelectedKey?: Key | null,
   /**
    * Handler that is called when the selection changes.
    * @deprecated
diff --git a/packages/@react-types/select/src/index.d.ts b/packages/@react-types/select/src/index.d.ts
index e30db1813cc..edb951aab63 100644
--- a/packages/@react-types/select/src/index.d.ts
+++ b/packages/@react-types/select/src/index.d.ts
@@ -51,7 +51,7 @@ export interface SelectProps<T, M extends SelectionMode = 'single'> extends Coll
    * The initial selected key in the collection (uncontrolled).
    * @deprecated
    */
-  defaultSelectedKey?: Key,
+  defaultSelectedKey?: Key | null,
   /**
    * Handler that is called when the selection changes.
    * @deprecated
diff --git a/packages/@react-types/shared/src/selection.d.ts b/packages/@react-types/shared/src/selection.d.ts
index e59aaf3e435..7327677b8a7 100644
--- a/packages/@react-types/shared/src/selection.d.ts
+++ b/packages/@react-types/shared/src/selection.d.ts
@@ -18,7 +18,7 @@ export interface SingleSelection {
   /** The currently selected key in the collection (controlled). */
   selectedKey?: Key | null,
   /** The initial selected key in the collection (uncontrolled). */
-  defaultSelectedKey?: Key,
+  defaultSelectedKey?: Key | null,
   /** Handler that is called when the selection changes. */
   onSelectionChange?: (key: Key | null) => void
 }
diff --git a/packages/@react-types/tabs/src/index.d.ts b/packages/@react-types/tabs/src/index.d.ts
index 4f17abe0e3c..6dbac3214ba 100644
--- a/packages/@react-types/tabs/src/index.d.ts
+++ b/packages/@react-types/tabs/src/index.d.ts
@@ -30,7 +30,7 @@ export interface AriaTabProps extends AriaLabelingProps {
   shouldSelectOnPressUp?: boolean
 }
 
-export interface TabListProps<T> extends CollectionBase<T>, Omit<SingleSelection, 'disallowEmptySelection' | 'selectedKey' | 'onSelectionChange'> {
+export interface TabListProps<T> extends CollectionBase<T>, Omit<SingleSelection, 'disallowEmptySelection' | 'selectedKey' | 'defaultSelectedKeys' | 'onSelectionChange'> {
   /**
    * Whether the TabList is disabled.
    * Shows that a selection exists, but is not available in that circumstance.
@@ -38,6 +38,8 @@ export interface TabListProps<T> extends CollectionBase<T>, Omit<SingleSelection
   isDisabled?: boolean,
   /** The currently selected key in the collection (controlled). */
   selectedKey?: Key,
+  /** The initial selected keys in the collection (uncontrolled). */
+  defaultSelectedKey?: Key,
   /** Handler that is called when the selection changes. */
   onSelectionChange?: (key: Key) => void
 }
@@ -62,7 +64,7 @@ export interface AriaTabPanelProps extends Omit<DOMProps, 'id'>, AriaLabelingPro
   id?: Key
 }
 
-export interface SpectrumTabsProps<T> extends AriaTabListBase, Omit<SingleSelection, 'disallowEmptySelection' | 'selectedKey' | 'onSelectionChange'>, DOMProps, StyleProps {
+export interface SpectrumTabsProps<T> extends AriaTabListBase, Omit<SingleSelection, 'disallowEmptySelection' | 'selectedKey' | 'defaultSelectedKey' | 'onSelectionChange'>, DOMProps, StyleProps {
   /** The children of the `<Tabs>` element. Should include `<TabList>` and `<TabPanels>` elements. */
   children: ReactNode,
   /** The item objects for each tab, for dynamic collections. */
@@ -79,6 +81,8 @@ export interface SpectrumTabsProps<T> extends AriaTabListBase, Omit<SingleSelect
   density?: 'compact' | 'regular',
   /** The currently selected key in the collection (controlled). */
   selectedKey?: Key,
+  /** The initial selected keys in the collection (uncontrolled). */
+  defaultSelectedKey?: Key,
   /** Handler that is called when the selection changes. */
   onSelectionChange?: (key: Key) => void
 }
diff --git a/packages/dev/s2-docs/pages/s2/ActionBar.mdx b/packages/dev/s2-docs/pages/s2/ActionBar.mdx
index 9d525fdbf71..a85707eac5c 100644
--- a/packages/dev/s2-docs/pages/s2/ActionBar.mdx
+++ b/packages/dev/s2-docs/pages/s2/ActionBar.mdx
@@ -10,11 +10,11 @@ export const description = 'Used when a user needs to perform actions on one or
 
 <PageDescription>{docs.exports.ActionBar.description}</PageDescription>
 
-<ExampleSwitcher type={null} examples={['TableView', 'ListView']}>
+<ExampleSwitcher type={null} examples={['TableView', 'ListView', 'TreeView']}>
 
 ```tsx render docs={docs.exports.ActionBar} links={docs.links} props={['isEmphasized']} type="s2" wide
 "use client";
-import {ActionBar, ActionButton, TableView, TableHeader, TableBody, Column, Row, Cell, Text} from '@react-spectrum/s2';
+import {ActionBar, ActionButton, TableView, TableHeader, TableBody, Column, Row, Cell} from '@react-spectrum/s2';
 import Edit from '@react-spectrum/s2/icons/Edit';
 import Copy from '@react-spectrum/s2/icons/Copy';
 import Delete from '@react-spectrum/s2/icons/Delete';
@@ -37,17 +37,14 @@ function Example(props) {
       renderActionBar={(selectedKeys) => (
         /*- begin focus -*/
         <ActionBar {...props}/* PROPS */>
-          <ActionButton onPress={() => alert('Edit action')}>
+          <ActionButton aria-label="Edit" onPress={() => alert('Edit action')}>
             <Edit />
-            <Text>Edit</Text>
           </ActionButton>
-          <ActionButton onPress={() => alert('Copy action')}>
+          <ActionButton aria-label="Copy" onPress={() => alert('Copy action')}>
             <Copy />
-            <Text>Copy</Text>
           </ActionButton>
-          <ActionButton onPress={() => alert('Delete action')}>
+          <ActionButton aria-label="Delete" onPress={() => alert('Delete action')}>
             <Delete />
-            <Text>Delete</Text>
           </ActionButton>
         </ActionBar>
         /*- end focus -*/
@@ -97,17 +94,14 @@ function Example(props) {
       renderActionBar={(selectedKeys) => (
         /*- begin focus -*/
         <ActionBar {...props}/* PROPS */>
-          <ActionButton onPress={() => alert('Edit action')}>
+          <ActionButton aria-label="Edit" onPress={() => alert('Edit action')}>
             <Edit />
-            <Text>Edit</Text>
           </ActionButton>
-          <ActionButton onPress={() => alert('Copy action')}>
+          <ActionButton aria-label="Copy" onPress={() => alert('Copy action')}>
             <Copy />
-            <Text>Copy</Text>
           </ActionButton>
-          <ActionButton onPress={() => alert('Delete action')}>
+          <ActionButton aria-label="Delete" onPress={() => alert('Delete action')}>
             <Delete />
-            <Text>Delete</Text>
           </ActionButton>
         </ActionBar>
         /*- end focus -*/
@@ -123,6 +117,63 @@ function Example(props) {
 }
 ```
 
+```tsx render docs={docs.exports.ActionBar} links={docs.links} props={['isEmphasized']} type="s2" wide
+"use client";
+import {ActionBar, ActionButton, TreeView, TreeViewItem, TreeViewItemContent} from '@react-spectrum/s2';
+import Edit from '@react-spectrum/s2/icons/Edit';
+import Copy from '@react-spectrum/s2/icons/Copy';
+import Delete from '@react-spectrum/s2/icons/Delete';
+import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
+
+function Example(props) {
+  return (
+    <TreeView
+      aria-label="TreeView with action bar"
+      selectionMode="multiple"
+      defaultExpandedKeys={['documents', 'project', 'photos']}
+      defaultSelectedKeys={['budget']}
+      styles={style({width: 'full', height: 250, maxWidth: 400})}
+      renderActionBar={(selectedKeys) => (
+        /*- begin focus -*/
+        <ActionBar {...props}/* PROPS */>
+          <ActionButton aria-label="Edit" onPress={() => alert('Edit action')}>
+            <Edit />
+          </ActionButton>
+          <ActionButton aria-label="Copy" onPress={() => alert('Copy action')}>
+            <Copy />
+          </ActionButton>
+          <ActionButton aria-label="Delete" onPress={() => alert('Delete action')}>
+            <Delete />
+          </ActionButton>
+        </ActionBar>
+        /*- end focus -*/
+      )}>
+      <TreeViewItem id="documents" textValue="Documents">
+        <TreeViewItemContent>Documents</TreeViewItemContent>
+        <TreeViewItem id="project" textValue="Project">
+          <TreeViewItemContent>Project</TreeViewItemContent>
+          <TreeViewItem id="report" textValue="Weekly Report">
+            <TreeViewItemContent>Weekly Report</TreeViewItemContent>
+          </TreeViewItem>
+          <TreeViewItem id="budget" textValue="Budget">
+            <TreeViewItemContent>Budget</TreeViewItemContent>
+          </TreeViewItem>
+        </TreeViewItem>
+      </TreeViewItem>
+      <TreeViewItem id="photos" textValue="Photos">
+        <TreeViewItemContent>Photos</TreeViewItemContent>
+        <TreeViewItem id="image-1" textValue="Image 1">
+          <TreeViewItemContent>Image 1</TreeViewItemContent>
+          </TreeViewItem>
+        <TreeViewItem id="image-2" textValue="Image 2">
+          <TreeViewItemContent>Image 2</TreeViewItemContent>
+        </TreeViewItem>
+      </TreeViewItem>
+    </TreeView>
+  );
+}
+```
+
 </ExampleSwitcher>
 
 ## API
diff --git a/packages/dev/s2-docs/pages/s2/ListView.mdx b/packages/dev/s2-docs/pages/s2/ListView.mdx
index 79dc2ee87b3..d7848262f11 100644
--- a/packages/dev/s2-docs/pages/s2/ListView.mdx
+++ b/packages/dev/s2-docs/pages/s2/ListView.mdx
@@ -19,7 +19,6 @@ import {ListView, ListViewItem, Text} from '@react-spectrum/s2';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 
 <ListView
-  aria-label="Files"
   /* PROPS */
   styles={style({width: 'full', maxWidth: 400, height: 320})}>
   <ListViewItem id="adobe-photoshop" textValue="Adobe Photoshop">
@@ -89,7 +88,7 @@ let images = [
 ///- end collapse -///
 
 <div className={style({display: 'flex', gap: 24, width: 'full', flexWrap: 'wrap', justifyContent: 'center'})}>
-  <ListView aria-label="Documents" items={documents} styles={style({flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 280, maxWidth: 400, height: 320})}>
+  <ListView aria-label="Documents" items={documents} styles={style({flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 200, maxWidth: 400, height: 320})}>
     {item => (
       <ListViewItem id={item.id} textValue={item.name}>
         {/*- begin highlight -*/}
@@ -108,7 +107,7 @@ let images = [
       </ListViewItem>
     )}
   </ListView>
-  <ListView aria-label="Images" items={images} styles={style({flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 280, maxWidth: 400, height: 320})}>
+  <ListView aria-label="Images" items={images} styles={style({flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 200, maxWidth: 400, height: 320})}>
     {item => (
       <ListViewItem id={item.id} textValue={item.name}>
         {/*- begin highlight -*/}