diff --git a/packages/block-editor/src/components/block-list/block-wrapper.js b/packages/block-editor/src/components/block-list/block-wrapper.js
index 4aef321a0bf20..dc837ff8f9b8f 100644
--- a/packages/block-editor/src/components/block-list/block-wrapper.js
+++ b/packages/block-editor/src/components/block-list/block-wrapper.js
@@ -19,6 +19,7 @@ import { ENTER, BACKSPACE, DELETE } from '@wordpress/keycodes';
 import { __, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
+import { __unstableGetBlockProps as getBlockProps } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -286,6 +287,13 @@ export function useBlockWrapperProps( props = {}, { __unstableIsHtml } = {} ) {
 	};
 }
 
+/**
+ * Call within a save function to get the props for the block wrapper.
+ *
+ * @param {Object} props Optional. Props to pass to the element.
+ */
+useBlockWrapperProps.save = getBlockProps;
+
 const BlockComponent = forwardRef(
 	( { children, tagName: TagName = 'div', ...props }, ref ) => {
 		deprecated( 'wp.blockEditor.__experimentalBlock', {
diff --git a/packages/block-editor/src/components/block-list/block-wrapper.native.js b/packages/block-editor/src/components/block-list/block-wrapper.native.js
index 10aea4bb9edd7..55c3bff51f66b 100644
--- a/packages/block-editor/src/components/block-list/block-wrapper.native.js
+++ b/packages/block-editor/src/components/block-list/block-wrapper.native.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { __unstableGetBlockProps as getBlockProps } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
@@ -7,6 +12,8 @@ export function useBlockWrapperProps( props = {} ) {
 	return props;
 }
 
+useBlockWrapperProps.save = getBlockProps;
+
 const ExtendedBlockComponent = ELEMENTS.reduce( ( acc, element ) => {
 	acc[ element ] = element;
 	return acc;
diff --git a/packages/block-library/src/audio/save.js b/packages/block-library/src/audio/save.js
index f88eb0bba52e0..15faa71d8536b 100644
--- a/packages/block-library/src/audio/save.js
+++ b/packages/block-library/src/audio/save.js
@@ -1,14 +1,17 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { autoplay, caption, loop, preload, src } = attributes;
 
 	return (
 		src && (
-			<figure>
+			<figure { ...useBlockWrapperProps.save() }>
 				<audio
 					controls="controls"
 					src={ src }
diff --git a/packages/block-library/src/button/save.js b/packages/block-library/src/button/save.js
index 3fcf98e6edb12..5613aef5ad762 100644
--- a/packages/block-library/src/button/save.js
+++ b/packages/block-library/src/button/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -33,7 +36,7 @@ export default function save( { attributes } ) {
 	// A title will no longer be assigned for new or updated button block links.
 
 	return (
-		<div>
+		<div { ...useBlockWrapperProps.save() }>
 			<RichText.Content
 				tagName="a"
 				className={ buttonClasses }
diff --git a/packages/block-library/src/buttons/save.js b/packages/block-library/src/buttons/save.js
index 91cb804231d05..07852d4931ed5 100644
--- a/packages/block-library/src/buttons/save.js
+++ b/packages/block-library/src/buttons/save.js
@@ -1,11 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save() {
 	return (
-		<div>
+		<div { ...useBlockWrapperProps.save() }>
 			<InnerBlocks.Content />
 		</div>
 	);
diff --git a/packages/block-library/src/code/save.js b/packages/block-library/src/code/save.js
index 22b5e17a2cd65..386cea7cc014e 100644
--- a/packages/block-library/src/code/save.js
+++ b/packages/block-library/src/code/save.js
@@ -1,7 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -10,7 +13,7 @@ import { escape } from './utils';
 
 export default function save( { attributes } ) {
 	return (
-		<pre>
+		<pre { ...useBlockWrapperProps.save() }>
 			<RichText.Content
 				tagName="code"
 				value={ escape( attributes.content ) }
diff --git a/packages/block-library/src/column/save.js b/packages/block-library/src/column/save.js
index d0dda9de3174b..b0ee55233d5e5 100644
--- a/packages/block-library/src/column/save.js
+++ b/packages/block-library/src/column/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { verticalAlignment, width } = attributes;
@@ -21,7 +24,12 @@ export default function save( { attributes } ) {
 	}
 
 	return (
-		<div className={ wrapperClasses } style={ style }>
+		<div
+			{ ...useBlockWrapperProps.save( {
+				className: wrapperClasses,
+				style,
+			} ) }
+		>
 			<InnerBlocks.Content />
 		</div>
 	);
diff --git a/packages/block-library/src/columns/save.js b/packages/block-library/src/columns/save.js
index 0d9a5305cbeae..26e0435bd648e 100644
--- a/packages/block-library/src/columns/save.js
+++ b/packages/block-library/src/columns/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { verticalAlignment } = attributes;
@@ -16,7 +19,7 @@ export default function save( { attributes } ) {
 	} );
 
 	return (
-		<div className={ className ? className : undefined }>
+		<div { ...useBlockWrapperProps.save( { className } ) }>
 			<InnerBlocks.Content />
 		</div>
 	);
diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
index 58374ce5ed887..cfb0a4b0cea6d 100644
--- a/packages/block-library/src/cover/save.js
+++ b/packages/block-library/src/cover/save.js
@@ -10,6 +10,7 @@ import {
 	InnerBlocks,
 	getColorClassName,
 	__experimentalGetGradientClass,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
 } from '@wordpress/block-editor';
 
 /**
@@ -95,7 +96,7 @@ export default function save( { attributes } ) {
 	);
 
 	return (
-		<div className={ classes } style={ style }>
+		<div { ...useBlockWrapperProps.save( { className: classes, style } ) }>
 			{ url && ( gradient || customGradient ) && dimRatio !== 0 && (
 				<span
 					aria-hidden="true"
diff --git a/packages/block-library/src/group/save.js b/packages/block-library/src/group/save.js
index f24c9f37cdf40..6a8da906ef998 100644
--- a/packages/block-library/src/group/save.js
+++ b/packages/block-library/src/group/save.js
@@ -1,13 +1,16 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { tagName: Tag } = attributes;
 
 	return (
-		<Tag>
+		<Tag { ...useBlockWrapperProps.save() }>
 			<div className="wp-block-group__inner-container">
 				<InnerBlocks.Content />
 			</div>
diff --git a/packages/block-library/src/heading/save.js b/packages/block-library/src/heading/save.js
index 00ecf40e1c27c..3d7b070eab3b6 100644
--- a/packages/block-library/src/heading/save.js
+++ b/packages/block-library/src/heading/save.js
@@ -6,21 +6,22 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { align, content, level } = attributes;
-	const tagName = 'h' + level;
+	const TagName = 'h' + level;
 
 	const className = classnames( {
 		[ `has-text-align-${ align }` ]: align,
 	} );
 
 	return (
-		<RichText.Content
-			className={ className ? className : undefined }
-			tagName={ tagName }
-			value={ content }
-		/>
+		<TagName { ...useBlockWrapperProps.save( { className } ) }>
+			<RichText.Content value={ content } />
+		</TagName>
 	);
 }
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index 4124e9c951e38..161c016258727 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -7,7 +7,10 @@ import { isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const {
@@ -67,11 +70,15 @@ export default function save( { attributes } ) {
 
 	if ( 'left' === align || 'right' === align || 'center' === align ) {
 		return (
-			<div>
+			<div { ...useBlockWrapperProps.save() }>
 				<figure className={ classes }>{ figure }</figure>
 			</div>
 		);
 	}
 
-	return <figure className={ classes }>{ figure }</figure>;
+	return (
+		<figure { ...useBlockWrapperProps.save( { className: classes } ) }>
+			{ figure }
+		</figure>
+	);
 }
diff --git a/packages/block-library/src/list/save.js b/packages/block-library/src/list/save.js
index 8cd1d3870148b..41184eb6b6d95 100644
--- a/packages/block-library/src/list/save.js
+++ b/packages/block-library/src/list/save.js
@@ -1,20 +1,18 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { ordered, values, type, reversed, start } = attributes;
-	const tagName = ordered ? 'ol' : 'ul';
+	const TagName = ordered ? 'ol' : 'ul';
 
 	return (
-		<RichText.Content
-			tagName={ tagName }
-			value={ values }
-			type={ type }
-			reversed={ reversed }
-			start={ start }
-			multiline="li"
-		/>
+		<TagName { ...useBlockWrapperProps.save( { type, reversed, start } ) }>
+			<RichText.Content value={ values } multiline="li" />
+		</TagName>
 	);
 }
diff --git a/packages/block-library/src/media-text/save.js b/packages/block-library/src/media-text/save.js
index 104f0ec099abd..a458e2fa5940e 100644
--- a/packages/block-library/src/media-text/save.js
+++ b/packages/block-library/src/media-text/save.js
@@ -7,7 +7,10 @@ import { noop, isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -88,7 +91,7 @@ export default function save( { attributes } ) {
 		gridTemplateColumns,
 	};
 	return (
-		<div className={ className } style={ style }>
+		<div { ...useBlockWrapperProps.save( { className, style } ) }>
 			<figure
 				className="wp-block-media-text__media"
 				style={ backgroundStyles }
diff --git a/packages/block-library/src/paragraph/save.js b/packages/block-library/src/paragraph/save.js
index 434cc02229558..2de85ea880d06 100644
--- a/packages/block-library/src/paragraph/save.js
+++ b/packages/block-library/src/paragraph/save.js
@@ -6,22 +6,21 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { align, content, dropCap, direction } = attributes;
-
 	const className = classnames( {
 		'has-drop-cap': dropCap,
 		[ `has-text-align-${ align }` ]: align,
 	} );
 
 	return (
-		<RichText.Content
-			tagName="p"
-			className={ className ? className : undefined }
-			value={ content }
-			dir={ direction }
-		/>
+		<p { ...useBlockWrapperProps.save( { className, dir: direction } ) }>
+			<RichText.Content value={ content } />
+		</p>
 	);
 }
diff --git a/packages/block-library/src/preformatted/save.js b/packages/block-library/src/preformatted/save.js
index f11dabb3f93e6..95d26b71b585b 100644
--- a/packages/block-library/src/preformatted/save.js
+++ b/packages/block-library/src/preformatted/save.js
@@ -1,10 +1,17 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { content } = attributes;
 
-	return <RichText.Content tagName="pre" value={ content } />;
+	return (
+		<pre { ...useBlockWrapperProps.save() }>
+			<RichText.Content value={ content } />
+		</pre>
+	);
 }
diff --git a/packages/block-library/src/quote/save.js b/packages/block-library/src/quote/save.js
index 92374a593ba7f..83bb34f0e6bba 100644
--- a/packages/block-library/src/quote/save.js
+++ b/packages/block-library/src/quote/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { align, value, citation } = attributes;
@@ -16,7 +19,7 @@ export default function save( { attributes } ) {
 	} );
 
 	return (
-		<blockquote className={ className }>
+		<blockquote { ...useBlockWrapperProps.save( { className } ) }>
 			<RichText.Content multiline value={ value } />
 			{ ! RichText.isEmpty( citation ) && (
 				<RichText.Content tagName="cite" value={ citation } />
diff --git a/packages/block-library/src/social-links/save.js b/packages/block-library/src/social-links/save.js
index d21ee51216daa..29ccad1c5cfe7 100644
--- a/packages/block-library/src/social-links/save.js
+++ b/packages/block-library/src/social-links/save.js
@@ -1,11 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
-export default function save( { className } ) {
+export default function save() {
 	return (
-		<ul className={ className }>
+		<ul { ...useBlockWrapperProps.save() }>
 			<InnerBlocks.Content />
 		</ul>
 	);
diff --git a/packages/block-library/src/verse/save.js b/packages/block-library/src/verse/save.js
index 59bb855746269..55f22fef9599f 100644
--- a/packages/block-library/src/verse/save.js
+++ b/packages/block-library/src/verse/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { textAlign, content } = attributes;
@@ -16,10 +19,8 @@ export default function save( { attributes } ) {
 	} );
 
 	return (
-		<RichText.Content
-			tagName="pre"
-			className={ className }
-			value={ content }
-		/>
+		<pre { ...useBlockWrapperProps.save( { className } ) }>
+			<RichText.Content value={ content } />
+		</pre>
 	);
 }
diff --git a/packages/block-library/src/video/save.js b/packages/block-library/src/video/save.js
index a16c3b0fd387a..baf7e248b3f10 100644
--- a/packages/block-library/src/video/save.js
+++ b/packages/block-library/src/video/save.js
@@ -1,7 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalUseBlockWrapperProps as useBlockWrapperProps,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const {
@@ -16,7 +19,7 @@ export default function save( { attributes } ) {
 		playsInline,
 	} = attributes;
 	return (
-		<figure>
+		<figure { ...useBlockWrapperProps.save() }>
 			{ src && (
 				<video
 					autoPlay={ autoplay }
diff --git a/packages/blocks/src/api/index.js b/packages/blocks/src/api/index.js
index 846a360e96199..ed50a953509e5 100644
--- a/packages/blocks/src/api/index.js
+++ b/packages/blocks/src/api/index.js
@@ -24,6 +24,7 @@ export {
 	getBlockMenuDefaultClassName,
 	getSaveElement,
 	getSaveContent,
+	getBlockProps as __unstableGetBlockProps,
 } from './serializer';
 export { isValidBlockContent } from './validation';
 export { getCategories, setCategories, updateCategory } from './categories';
diff --git a/packages/blocks/src/api/serializer.js b/packages/blocks/src/api/serializer.js
index 886a1ad69b613..bbce8a044c99d 100644
--- a/packages/blocks/src/api/serializer.js
+++ b/packages/blocks/src/api/serializer.js
@@ -17,6 +17,7 @@ import {
 	getBlockType,
 	getFreeformContentHandlerName,
 	getUnregisteredTypeHandlerName,
+	hasBlockSupport,
 } from './registration';
 import { normalizeBlockType } from './utils';
 import BlockContentProvider from '../block-content-provider';
@@ -68,6 +69,23 @@ export function getBlockMenuDefaultClassName( blockName ) {
 	);
 }
 
+const blockPropsProvider = {};
+
+/**
+ * Call within a save function to get the props for the block wrapper.
+ *
+ * @param {Object} props Optional. Props to pass to the element.
+ */
+export function getBlockProps( props = {} ) {
+	const { blockType, attributes } = blockPropsProvider;
+	return applyFilters(
+		'blocks.getSaveContent.extraProps',
+		{ ...props },
+		blockType,
+		attributes
+	);
+}
+
 /**
  * Given a block type containing a save render implementation and attributes, returns the
  * enhanced element to be saved or string when raw HTML expected.
@@ -94,11 +112,15 @@ export function getSaveElement(
 		save = instance.render.bind( instance );
 	}
 
+	blockPropsProvider.blockType = blockType;
+	blockPropsProvider.attributes = attributes;
+
 	let element = save( { attributes, innerBlocks } );
 
 	if (
 		isObject( element ) &&
-		hasFilter( 'blocks.getSaveContent.extraProps' )
+		hasFilter( 'blocks.getSaveContent.extraProps' ) &&
+		! hasBlockSupport( blockType, 'lightBlockWrapper', false )
 	) {
 		/**
 		 * Filters the props applied to the block save result element.