diff --git a/projects/js-packages/publicize-components/changelog/update-base-control-bottom-margin-style-deprecation b/projects/js-packages/publicize-components/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/js-packages/publicize-components/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/js-packages/publicize-components/src/components/connection-management/mark-as-shared.tsx b/projects/js-packages/publicize-components/src/components/connection-management/mark-as-shared.tsx
index 913a1c9b2016f..d11f32b3dab76 100644
--- a/projects/js-packages/publicize-components/src/components/connection-management/mark-as-shared.tsx
+++ b/projects/js-packages/publicize-components/src/components/connection-management/mark-as-shared.tsx
@@ -45,6 +45,7 @@ export function MarkAsShared( { connection }: MarkAsSharedProps ) {
 			onChange={ onChange }
 			disabled={ isUpdating || connection.status === 'broken' }
 			label={ __( 'Mark the connection as shared', 'jetpack' ) }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 }
diff --git a/projects/js-packages/publicize-components/src/components/message-box-control/index.js b/projects/js-packages/publicize-components/src/components/message-box-control/index.js
index 76c62f701fd96..f9be2097578d2 100644
--- a/projects/js-packages/publicize-components/src/components/message-box-control/index.js
+++ b/projects/js-packages/publicize-components/src/components/message-box-control/index.js
@@ -55,6 +55,7 @@ export default function MessageBoxControl( {
 				_n( '%d character remaining', '%d characters remaining', charactersRemaining, 'jetpack' ),
 				charactersRemaining
 			) }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 }
diff --git a/projects/js-packages/publicize-components/src/components/panel/index.jsx b/projects/js-packages/publicize-components/src/components/panel/index.jsx
index 710d7031b6216..06166ee4d26f0 100644
--- a/projects/js-packages/publicize-components/src/components/panel/index.jsx
+++ b/projects/js-packages/publicize-components/src/components/panel/index.jsx
@@ -68,6 +68,7 @@ const PublicizePanel = ( { prePublish, children } ) => {
 							onChange={ togglePublicizeFeature }
 							checked={ isPublicizeEnabled && hasConnections }
 							disabled={ ! hasConnections }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 
diff --git a/projects/js-packages/publicize-components/src/components/social-image-generator/panel/index.js b/projects/js-packages/publicize-components/src/components/social-image-generator/panel/index.js
index fd5f7ec71fd26..6d2f903aeb541 100644
--- a/projects/js-packages/publicize-components/src/components/social-image-generator/panel/index.js
+++ b/projects/js-packages/publicize-components/src/components/social-image-generator/panel/index.js
@@ -51,6 +51,7 @@ const SocialImageGeneratorPanel = ( { prePublish = false } ) => {
 				help={ ! isEnabled ? __( 'Social Image is disabled for this post.', 'jetpack' ) : '' }
 				checked={ isEnabled }
 				onChange={ setIsEnabled }
+				__nextHasNoMarginBottom={ true }
 			/>
 			{ isEnabled && (
 				<>
diff --git a/projects/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js b/projects/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js
index ed6f8b475f6f0..cc430bb371e05 100644
--- a/projects/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js
+++ b/projects/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js
@@ -70,6 +70,7 @@ const SocialImageGeneratorSettingsModal = ( { onClose } ) => {
 						{ label: __( 'No Image', 'jetpack' ), value: 'none' },
 					] }
 					onChange={ setEditedImageType }
+					__nextHasNoMarginBottom={ true }
 				/>
 
 				{ localImageType === 'custom' && (
@@ -92,6 +93,7 @@ const SocialImageGeneratorSettingsModal = ( { onClose } ) => {
 						'By default the post title is used for the image. You can use this field to set your own text.',
 						'jetpack'
 					) }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<BaseControl __nextHasNoMarginBottom={ true } className={ styles.templateControl }>
 					<BaseControl.VisualLabel>{ __( 'Templates', 'jetpack' ) }</BaseControl.VisualLabel>
diff --git a/projects/js-packages/publicize-components/src/components/social-post-modal/preview-section.tsx b/projects/js-packages/publicize-components/src/components/social-post-modal/preview-section.tsx
index 3a917dd4882a1..dd81de8c1285e 100644
--- a/projects/js-packages/publicize-components/src/components/social-post-modal/preview-section.tsx
+++ b/projects/js-packages/publicize-components/src/components/social-post-modal/preview-section.tsx
@@ -98,6 +98,7 @@ export function PreviewSection() {
 										}
 										checked={ isEnabled }
 										onChange={ toggleConnection( tab.connection_id, tab ) }
+										__nextHasNoMarginBottom={ true }
 									/>
 								) : null
 							}
diff --git a/projects/packages/forms/changelog/update-base-control-bottom-margin-style-deprecation b/projects/packages/forms/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/packages/forms/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings-plugin-state.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings-plugin-state.js
index a5812bfc8c0d1..f12a4cf58c657 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings-plugin-state.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings-plugin-state.js
@@ -126,6 +126,7 @@ const CRMPluginIsActive = ( { crmData, setCRMData, jetpackCRM, setAttributes } )
 			checked={ jetpackCRM }
 			onChange={ value => setAttributes( { jetpackCRM: value } ) }
 			help={ __( 'Store contact form submissions in your CRM.', 'jetpack-forms' ) }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 };
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings.js
index b56a398b80bb9..2ecbb722c1a9a 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-crm-integration/jetpack-crm-integration-settings.js
@@ -65,7 +65,7 @@ const CRMPluginData = ( { jetpackCRM, setAttributes } ) => {
 
 const CRMIntegrationSettings = ( { jetpackCRM, setAttributes } ) => {
 	return (
-		<BaseControl>
+		<BaseControl __nextHasNoMarginBottom={ true }>
 			<CRMPluginData jetpackCRM={ jetpackCRM } setAttributes={ setAttributes } />
 		</BaseControl>
 	);
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-email-connection-settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-email-connection-settings.js
index c7fb6fd26529c..77579069223b4 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-email-connection-settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-email-connection-settings.js
@@ -109,6 +109,7 @@ const JetpackEmailConnectionSettings = ( {
 					'You can enter multiple email addresses separated by commas.',
 					'jetpack-forms'
 				) }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<HelpMessage isError id={ `contact-form-${ instanceId }-email-error` }>
@@ -120,6 +121,7 @@ const JetpackEmailConnectionSettings = ( {
 				value={ emailSubject }
 				placeholder={ __( 'Enter a subject', 'jetpack-forms' ) }
 				onChange={ newSubject => setAttributes( { subject: newSubject } ) }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</>
 	);
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-checkbox.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-checkbox.js
index 06a0782c60db0..d6d18dc61379f 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-checkbox.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-checkbox.js
@@ -63,6 +63,7 @@ function JetpackFieldCheckbox( props ) {
 							label={ __( 'Checked by default', 'jetpack-forms' ) }
 							checked={ defaultValue }
 							onChange={ value => setAttributes( { defaultValue: value ? 'true' : '' } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</PanelBody>
 				</InspectorControls>
@@ -77,6 +78,7 @@ function JetpackFieldCheckbox( props ) {
 							checked={ required }
 							onChange={ value => setAttributes( { required: value } ) }
 							help={ __( 'You can edit the "required" label in the editor', 'jetpack-forms' ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 						<JetpackFieldWidth setAttributes={ setAttributes } width={ width } />
 
@@ -85,6 +87,7 @@ function JetpackFieldCheckbox( props ) {
 							checked={ attributes.shareFieldAttributes }
 							onChange={ value => setAttributes( { shareFieldAttributes: value } ) }
 							help={ __( 'Deactivate for individual styling of this block', 'jetpack-forms' ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</PanelBody>
 					<PanelColorSettings
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-consent.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-consent.js
index ffb7d437bf5a9..3e5e11229bc7e 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-consent.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-consent.js
@@ -54,6 +54,7 @@ const JetpackFieldConsent = ( {
 						checked={ attributes.shareFieldAttributes }
 						onChange={ value => setAttributes( { shareFieldAttributes: value } ) }
 						help={ __( 'Deactivate for individual styling of this block', 'jetpack-forms' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 				<PanelColorSettings
@@ -68,7 +69,7 @@ const JetpackFieldConsent = ( {
 					] }
 				/>
 				<PanelBody title={ __( 'Consent Settings', 'jetpack-forms' ) }>
-					<BaseControl>
+					<BaseControl __nextHasNoMarginBottom={ true }>
 						<SelectControl
 							label={ __( 'Permission to email', 'jetpack-forms' ) }
 							value={ consentType }
@@ -77,6 +78,7 @@ const JetpackFieldConsent = ( {
 								{ label: __( 'Add a privacy checkbox', 'jetpack-forms' ), value: 'explicit' },
 							] }
 							onChange={ value => setAttributes( { consentType: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</BaseControl>
 				</PanelBody>
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-controls.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-controls.js
index d9dcda1926c5c..23e65e7e64f51 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-controls.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-controls.js
@@ -113,6 +113,7 @@ const JetpackFieldControls = ( {
 			checked={ required }
 			onChange={ value => setAttributes( { required: value } ) }
 			help={ __( 'You can edit the "required" label in the editor', 'jetpack-forms' ) }
+			__nextHasNoMarginBottom={ true }
 		/>,
 		! hidePlaceholder && (
 			<TextControl
@@ -124,6 +125,7 @@ const JetpackFieldControls = ( {
 					'Show visitors an example of the type of content expected. Otherwise, leave blank.',
 					'jetpack-forms'
 				) }
+				__nextHasNoMarginBottom={ true }
 			/>
 		),
 		<JetpackFieldWidth key="width" setAttributes={ setAttributes } width={ width } />,
@@ -133,6 +135,7 @@ const JetpackFieldControls = ( {
 			checked={ attributes.shareFieldAttributes }
 			onChange={ value => setAttributes( { shareFieldAttributes: value } ) }
 			help={ __( 'Deactivate for individual styling of this block', 'jetpack-forms' ) }
+			__nextHasNoMarginBottom={ true }
 		/>,
 	];
 
@@ -203,6 +206,7 @@ const JetpackFieldControls = ( {
 								onChange={ setNumberAttribute( 'buttonBorderWidth' ) }
 								min={ 0 }
 								max={ 100 }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<RangeControl
 								label={ __( 'Button Border Radius', 'jetpack-forms' ) }
@@ -211,6 +215,7 @@ const JetpackFieldControls = ( {
 								onChange={ setNumberAttribute( 'buttonBorderRadius' ) }
 								min={ 0 }
 								max={ 100 }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</>
 					) }
@@ -223,6 +228,7 @@ const JetpackFieldControls = ( {
 								onChange={ setNumberAttribute( 'borderWidth' ) }
 								min={ 0 }
 								max={ 100 }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<RangeControl
 								label={ __( 'Border Radius', 'jetpack-forms' ) }
@@ -231,6 +237,7 @@ const JetpackFieldControls = ( {
 								onChange={ setNumberAttribute( 'borderRadius' ) }
 								min={ 0 }
 								max={ 100 }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</>
 					) }
@@ -266,6 +273,7 @@ const JetpackFieldControls = ( {
 						"Customize the input's name/ID. Only alphanumeric, dash and underscore characters are allowed",
 						'jetpack-forms'
 					) }
+					__nextHasNoMarginBottom={ true }
 				/>
 			</InspectorAdvancedControls>
 		</>
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-datepicker.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-datepicker.js
index ab41c2a6d3977..47188aa488e71 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-datepicker.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-datepicker.js
@@ -97,6 +97,7 @@ const JetpackDatePicker = props => {
 									'Select the format in which the date will be displayed.',
 									'jetpack-forms'
 								) }
+								__nextHasNoMarginBottom={ true }
 							/>
 						),
 					},
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-width.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-width.js
index c6c3eaf69fc19..e56af4a8f2234 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-width.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-width.js
@@ -9,6 +9,7 @@ export default function JetpackFieldWidth( { setAttributes, width } ) {
 				'jetpack-forms'
 			) }
 			className="jetpack-field-label__width"
+			__nextHasNoMarginBottom={ true }
 		>
 			<BaseControl.VisualLabel>{ __( 'Field Width', 'jetpack-forms' ) }</BaseControl.VisualLabel>
 			<ButtonGroup aria-label={ __( 'Field Width', 'jetpack-forms' ) }>
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-newsletter-integration-settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-newsletter-integration-settings.js
index 56091b44ab7c4..651d52c49a37e 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-newsletter-integration-settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-newsletter-integration-settings.js
@@ -4,7 +4,7 @@ import CreativeMailPlugin from './jetpack-newsletter-integration-settings-creati
 
 const NewsletterIntegrationSettings = () => {
 	return (
-		<BaseControl>
+		<BaseControl __nextHasNoMarginBottom={ true }>
 			<ConsentBlockSettings />
 			<CreativeMailPlugin />
 		</BaseControl>
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
index 989d8aa665215..343b9ec1fce2b 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
@@ -129,7 +129,7 @@ export default ( { salesforceData, setAttributes, instanceId } ) => {
 	return (
 		<Fragment>
 			<PanelBody title={ __( 'Salesforce', 'jetpack-forms' ) } initialOpen={ true }>
-				<BaseControl>
+				<BaseControl __nextHasNoMarginBottom={ true }>
 					<TextControl
 						label={ __( 'Organization ID', 'jetpack-forms' ) }
 						value={ salesforceData.organizationId || '' }
@@ -137,6 +137,7 @@ export default ( { salesforceData, setAttributes, instanceId } ) => {
 						onBlur={ onBlurOrgIdField }
 						onChange={ setOrganizationId }
 						help={ __( 'Enter the Salesforce organization ID to send Leads to.', 'jetpack-forms' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					{ organizationIdError && (
 						<HelpMessage isError id={ `contact-form-${ instanceId }-email-error` }>
diff --git a/projects/packages/forms/src/blocks/contact-form/edit.js b/projects/packages/forms/src/blocks/contact-form/edit.js
index 80d281df06f45..1dc222dacf1da 100644
--- a/projects/packages/forms/src/blocks/contact-form/edit.js
+++ b/projects/packages/forms/src/blocks/contact-form/edit.js
@@ -174,6 +174,7 @@ export const JetpackContactFormEdit = forwardRef(
 							{ label: __( 'Redirect to another webpage', 'jetpack-forms' ), value: 'redirect' },
 						] }
 						onChange={ newMessage => setAttributes( { customThankyou: newMessage } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					{ 'redirect' !== customThankyou && (
@@ -182,6 +183,7 @@ export const JetpackContactFormEdit = forwardRef(
 							value={ customThankyouHeading }
 							placeholder={ __( 'Your message has been sent', 'jetpack-forms' ) }
 							onChange={ newHeading => setAttributes( { customThankyouHeading: newHeading } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 
@@ -191,6 +193,7 @@ export const JetpackContactFormEdit = forwardRef(
 							value={ customThankyouMessage }
 							placeholder={ __( 'Thank you for your submission!', 'jetpack-forms' ) }
 							onChange={ newMessage => setAttributes( { customThankyouMessage: newMessage } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 
@@ -198,6 +201,7 @@ export const JetpackContactFormEdit = forwardRef(
 						<BaseControl
 							label={ __( 'Redirect Address', 'jetpack-forms' ) }
 							id={ `contact-form-${ instanceId }-thankyou-url` }
+							__nextHasNoMarginBottom={ true }
 						>
 							<URLInput
 								id={ `contact-form-${ instanceId }-thankyou-url` }
diff --git a/projects/packages/my-jetpack/_inc/components/welcome-flow/EvaluationStep.tsx b/projects/packages/my-jetpack/_inc/components/welcome-flow/EvaluationStep.tsx
index 8d6e7ab7dc0aa..5348c49593502 100644
--- a/projects/packages/my-jetpack/_inc/components/welcome-flow/EvaluationStep.tsx
+++ b/projects/packages/my-jetpack/_inc/components/welcome-flow/EvaluationStep.tsx
@@ -64,6 +64,7 @@ const EvaluationStep = ( {
 							label={ question }
 							checked={ values[ key ] }
 							onChange={ setChecked( key ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) ) }
 					<div className={ styles[ 'form-actions' ] }>
diff --git a/projects/packages/my-jetpack/changelog/update-base-control-bottom-margin-style-deprecation b/projects/packages/my-jetpack/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/packages/search/changelog/update-base-control-bottom-margin-style-deprecation b/projects/packages/search/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/packages/search/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/packages/search/src/customberg/components/sidebar/excluded-post-types-control.jsx b/projects/packages/search/src/customberg/components/sidebar/excluded-post-types-control.jsx
index 6e52bac68f12d..5d9d660b4ffcb 100644
--- a/projects/packages/search/src/customberg/components/sidebar/excluded-post-types-control.jsx
+++ b/projects/packages/search/src/customberg/components/sidebar/excluded-post-types-control.jsx
@@ -58,6 +58,7 @@ export default function ExcludedPostTypesControl( {
 					label={ VALID_POST_TYPES[ type ].name }
 					onChange={ changeHandler( type ) }
 					value={ type }
+					__nextHasNoMarginBottom={ true }
 				/>
 			) ) }
 		</div>
diff --git a/projects/packages/search/src/customberg/components/sidebar/sidebar-options.jsx b/projects/packages/search/src/customberg/components/sidebar/sidebar-options.jsx
index 48c9c819f50f2..22dee07d2f24d 100644
--- a/projects/packages/search/src/customberg/components/sidebar/sidebar-options.jsx
+++ b/projects/packages/search/src/customberg/components/sidebar/sidebar-options.jsx
@@ -104,6 +104,7 @@ export default function SidebarOptions() {
 					value={ sort }
 					options={ sortOptions }
 					onChange={ setSort }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<SelectControl
 					className="jp-search-configure-overlay-trigger-select"
@@ -121,6 +122,7 @@ export default function SidebarOptions() {
 						},
 					] }
 					onChange={ setTrigger }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ToggleControl
 					className="jp-search-configure-filtering-opens-overlay-toggle"
@@ -132,6 +134,7 @@ export default function SidebarOptions() {
 					) }
 					label={ __( 'Open overlay from filter links', 'jetpack-search-pkg' ) }
 					onChange={ setFilteringOpensOverlay }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ExcludedPostTypesControl
 					disabled={ isDisabled }
@@ -147,6 +150,7 @@ export default function SidebarOptions() {
 					disabled={ isDisabled }
 					label={ __( 'Show sort selector', 'jetpack-search-pkg' ) }
 					onChange={ setSortEnabled }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ToggleControl
 					className="jp-search-configure-infinite-scroll-toggle"
@@ -154,6 +158,7 @@ export default function SidebarOptions() {
 					disabled={ isDisabled }
 					label={ __( 'Enable infinite scroll', 'jetpack-search-pkg' ) }
 					onChange={ setInfiniteScroll }
+					__nextHasNoMarginBottom={ true }
 				/>
 				{ 'expanded' === resultFormat && (
 					<ToggleControl
@@ -162,6 +167,7 @@ export default function SidebarOptions() {
 						disabled={ isDisabled }
 						label={ __( 'Show post date', 'jetpack-search-pkg' ) }
 						onChange={ setPostDate }
+						__nextHasNoMarginBottom={ true }
 					/>
 				) }
 				{ ! isFreePlan && (
@@ -171,6 +177,7 @@ export default function SidebarOptions() {
 						disabled={ isDisabled }
 						label={ __( 'Show "Powered by Jetpack"', 'jetpack-search-pkg' ) }
 						onChange={ setShowLogo }
+						__nextHasNoMarginBottom={ true }
 					/>
 				) }
 			</PanelBody>
diff --git a/projects/packages/videopress/changelog/update-base-control-bottom-margin-style-deprecation b/projects/packages/videopress/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/packages/videopress/src/client/admin/components/edit-video-details/index.tsx b/projects/packages/videopress/src/client/admin/components/edit-video-details/index.tsx
index 61982c0e5930a..a0208bdd8241d 100644
--- a/projects/packages/videopress/src/client/admin/components/edit-video-details/index.tsx
+++ b/projects/packages/videopress/src/client/admin/components/edit-video-details/index.tsx
@@ -371,6 +371,7 @@ const EditVideoDetails = () => {
 												value: VIDEO_PRIVACY_LEVEL_PRIVATE,
 											},
 										] }
+										__nextHasNoMarginBottom={ true }
 									/>
 								) }
 								{ isFetchingData ? (
@@ -388,6 +389,7 @@ const EditVideoDetails = () => {
 												'jetpack-videopress-pkg'
 											) }
 											onChange={ value => setDisplayEmbed( value ? 1 : 0 ) }
+											__nextHasNoMarginBottom={ true }
 										/>
 									</>
 								) }
@@ -406,6 +408,7 @@ const EditVideoDetails = () => {
 												'jetpack-videopress-pkg'
 											) }
 											onChange={ value => setAllowDownload( value ? 1 : 0 ) }
+											__nextHasNoMarginBottom={ true }
 										/>
 									</>
 								) }
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.native.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.native.js
index 1942e26468ef4..34d26df869c70 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.native.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.native.js
@@ -86,6 +86,7 @@ export default function ColorPanel( { attributes, setAttributes } ) {
 							setAttributes( { useAverageColor: newUseAverageColor } )
 						}
 						checked={ useAverageColor }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.tsx
index 3f7e6474e8fb7..42cb91a4c3753 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/color-panel/index.tsx
@@ -90,6 +90,7 @@ export default function ColorPanel( { clientId, attributes, setAttributes }: Vid
 				}
 				onChange={ newUseAverageColor => setAttributes( { useAverageColor: newUseAverageColor } ) }
 				checked={ useAverageColor }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			{ ! useAverageColor && (
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.native.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.native.js
index 2d68c58936ee0..98344c3ed3191 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.native.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.native.js
@@ -34,6 +34,7 @@ export default function DetailsPanel( { attributes, setAttributes, videoBelongTo
 				placeholder={ titlePlaceholder }
 				label={ __( 'Title', 'jetpack-videopress-pkg' ) }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 			<BottomSheetTextControl
 				initialValue={ description }
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.tsx
index 52c38b2fcb02b..4b30bfc3b9450 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/details-panel/index.tsx
@@ -79,6 +79,7 @@ export default function DetailsPanel( {
 				}
 				onChange={ value => setAttributes( { title: value } ) }
 				disabled={ isRequestingVideoData || !! updateError || ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<TextareaControl
@@ -89,6 +90,7 @@ export default function DetailsPanel( {
 				rows={ descriptionControlRows }
 				disabled={ isRequestingVideoData || !! updateError || ! videoBelongToSite }
 				help={ descriptionHelp }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			{ ! hasUploadedChapters && hasIncompleteChapters && (
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.native.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.native.js
index bd8f632905fda..7d6d3fdcdc817 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.native.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.native.js
@@ -107,6 +107,7 @@ export default function PlaybackPanel( { attributes, setAttributes } ) {
 						checked={ autoplay && ! isPreviewOnHoverEnabled }
 						disabled={ isPreviewOnHoverEnabled }
 						help={ <AutoplayHelp /> }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<ToggleControl
@@ -114,12 +115,14 @@ export default function PlaybackPanel( { attributes, setAttributes } ) {
 						onChange={ handleAttributeChange( 'loop' ) }
 						checked={ loop }
 						help={ __( 'Restarts the video when it reaches the end.', 'jetpack-videopress-pkg' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<ToggleControl
 						label={ __( 'Muted', 'jetpack-videopress-pkg' ) }
 						onChange={ handleAttributeChange( 'muted' ) }
 						checked={ muted }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<ToggleControl
@@ -127,6 +130,7 @@ export default function PlaybackPanel( { attributes, setAttributes } ) {
 						onChange={ handleAttributeChange( 'controls' ) }
 						checked={ controls }
 						help={ __( 'Display the video playback controls.', 'jetpack-videopress-pkg' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<ToggleControl
@@ -137,6 +141,7 @@ export default function PlaybackPanel( { attributes, setAttributes } ) {
 							'Play the video inline instead of full-screen on mobile devices.',
 							'jetpack-videopress-pkg'
 						) }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<ToggleControl
@@ -150,6 +155,7 @@ export default function PlaybackPanel( { attributes, setAttributes } ) {
 							'Preload the video metadata when the page is loaded.',
 							'jetpack-videopress-pkg'
 						) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 			</>
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.tsx
index b2636a4fd1f1c..5718058ae43c7 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/playback-panel/index.tsx
@@ -77,6 +77,7 @@ export default function PlaybackPanel( { attributes, setAttributes }: VideoContr
 				checked={ autoplay && ! isPreviewOnHoverEnabled }
 				disabled={ isPreviewOnHoverEnabled }
 				help={ <AutoplayHelp /> }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -84,12 +85,14 @@ export default function PlaybackPanel( { attributes, setAttributes }: VideoContr
 				onChange={ handleAttributeChange( 'loop' ) }
 				checked={ loop }
 				help={ __( 'Restarts the video when it reaches the end.', 'jetpack-videopress-pkg' ) }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
 				label={ __( 'Muted', 'jetpack-videopress-pkg' ) }
 				onChange={ handleAttributeChange( 'muted' ) }
 				checked={ muted }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -97,6 +100,7 @@ export default function PlaybackPanel( { attributes, setAttributes }: VideoContr
 				onChange={ handleAttributeChange( 'controls' ) }
 				checked={ controls }
 				help={ __( 'Display the video playback controls.', 'jetpack-videopress-pkg' ) }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -107,6 +111,7 @@ export default function PlaybackPanel( { attributes, setAttributes }: VideoContr
 					'Play the video inline instead of full-screen on mobile devices.',
 					'jetpack-videopress-pkg'
 				) }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -120,6 +125,7 @@ export default function PlaybackPanel( { attributes, setAttributes }: VideoContr
 					'Preload the video metadata when the page is loaded.',
 					'jetpack-videopress-pkg'
 				) }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			{ createInterpolateElement(
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-panel/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-panel/index.tsx
index 48a9537c51d09..0b1b003a49f34 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-panel/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-panel/index.tsx
@@ -395,6 +395,7 @@ export function VideoHoverPreviewControl( {
 				checked={ previewOnHover }
 				onChange={ onPreviewOnHoverChange }
 				disabled={ ! previewOnHover && disabled }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			{ previewOnHover && (
@@ -551,6 +552,7 @@ export default function PosterPanel( {
 				checked={ pickPosterFromFrame && videoBelongToSite }
 				onChange={ switchPosterSource }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<div
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.native.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.native.js
index 35af313cf5f7d..97e4b074a3f11 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.native.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.native.js
@@ -84,6 +84,7 @@ export default function PrivacyAndRatingSettings( {
 					setAttributes( { rating: value } );
 				} }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<SelectControl
@@ -104,6 +105,7 @@ export default function PrivacyAndRatingSettings( {
 				value={ String( privacySetting ) }
 				options={ [ privacyOptionSiteDefault, privacyOptionPublic, privacyOptionPrivate ] }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -113,6 +115,7 @@ export default function PrivacyAndRatingSettings( {
 					setAttributes( { allowDownload: value } );
 				} }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -126,6 +129,7 @@ export default function PrivacyAndRatingSettings( {
 					'jetpack-videopress-pkg'
 				) }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			{ ! videoBelongToSite && <VideoNotOwnedWarning /> }
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.tsx
index 1bff6857e5e32..4660e0c69c38c 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/privacy-and-rating-panel/privacy-and-rating-settings.tsx
@@ -84,6 +84,7 @@ export default function PrivacyAndRatingSettings( {
 					setAttributes( { rating: value } );
 				} }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<SelectControl
@@ -107,6 +108,7 @@ export default function PrivacyAndRatingSettings( {
 				value={ String( privacySetting ) }
 				options={ [ privacyOptionSiteDefault, privacyOptionPublic, privacyOptionPrivate ] }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -116,6 +118,7 @@ export default function PrivacyAndRatingSettings( {
 					setAttributes( { allowDownload: value } );
 				} }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<ToggleControl
@@ -129,6 +132,7 @@ export default function PrivacyAndRatingSettings( {
 					'jetpack-videopress-pkg'
 				) }
 				disabled={ ! videoBelongToSite }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</PanelBody>
 	);
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/tracks-control/track-form.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/tracks-control/track-form.tsx
index 0a5491bc53cc9..fda27567b1879 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/tracks-control/track-form.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/tracks-control/track-form.tsx
@@ -172,6 +172,7 @@ export default function TrackForm( {
 						value={ track.label }
 						help={ __( 'Title of track', 'jetpack-videopress-pkg' ) }
 						disabled={ isSavingTrack }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<TextControl
 						className="video-tracks-control__track-form-language-tag"
@@ -180,6 +181,7 @@ export default function TrackForm( {
 						onChange={ setSourceLanguage }
 						help={ __( 'Language (en, fr, etc.)', 'jetpack-videopress-pkg' ) }
 						disabled={ isSavingTrack }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</div>
 				<SelectControl
@@ -191,6 +193,7 @@ export default function TrackForm( {
 					}
 					onChange={ newKind => updateTrack( 'kind', newKind ) }
 					disabled={ isSavingTrack }
+					__nextHasNoMarginBottom={ true }
 				/>
 
 				{ error && (
@@ -210,6 +213,7 @@ export default function TrackForm( {
 							label={ __( 'Track exists. Replace?', 'jetpack-videopress-pkg' ) }
 							checked={ replaceTrack }
 							onChange={ setReplaceTrack }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 					<Button
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-editor.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-editor.js
index 9488d3f91140d..65c95114bc3ee 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-editor.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-editor.js
@@ -88,7 +88,7 @@ const UploadingEditor = props => {
 
 	return (
 		<div className="uploading-editor">
-			<BaseControl>
+			<BaseControl __nextHasNoMarginBottom={ true }>
 				<BaseControl.VisualLabel>
 					{ __( 'Video poster (optional)', 'jetpack-videopress-pkg' ) }
 				</BaseControl.VisualLabel>
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-progress.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-progress.js
index 53c801a21baf5..5210489575053 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-progress.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/uploader-progress.js
@@ -209,6 +209,7 @@ const UploaderProgress = ( {
 				onChange={ newTitle => setAttributes( { title: newTitle } ) }
 				value={ title }
 				placeholder={ filename }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<UploadingEditor
diff --git a/projects/packages/videopress/src/client/components/timestamp-control/index.tsx b/projects/packages/videopress/src/client/components/timestamp-control/index.tsx
index d9b6b077dd5c2..d171a6fbfb0ab 100644
--- a/projects/packages/videopress/src/client/components/timestamp-control/index.tsx
+++ b/projects/packages/videopress/src/client/components/timestamp-control/index.tsx
@@ -346,7 +346,7 @@ export const TimestampControl = ( props: TimestampControlProps ): React.ReactEle
 		typeof renderTooltip === 'function' ? renderTooltip : ( time: number ) => formatTime( time );
 
 	return (
-		<BaseControl { ...baseControlProps }>
+		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom={ true }>
 			<div className={ styles[ 'timestamp-control__controls-wrapper' ] }>
 				{ NumberControl && (
 					<TimestampInput
@@ -372,6 +372,7 @@ export const TimestampControl = ( props: TimestampControlProps ): React.ReactEle
 					marks={ marksEvery ? marks : undefined }
 					renderTooltipContent={ renderTooltipHandler }
 					{ ...( renderTooltip === false ? { showTooltip: false } : {} ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 			</div>
 		</BaseControl>
diff --git a/projects/packages/videopress/src/client/components/timestamp-control/stories/index.stories.tsx b/projects/packages/videopress/src/client/components/timestamp-control/stories/index.stories.tsx
index 2078535570729..e684e85e39af6 100644
--- a/projects/packages/videopress/src/client/components/timestamp-control/stories/index.stories.tsx
+++ b/projects/packages/videopress/src/client/components/timestamp-control/stories/index.stories.tsx
@@ -92,6 +92,7 @@ const ChangingValueTemplate: StoryFn< typeof TimestampControl > = args => {
 				value={ value }
 				onChange={ setValue }
 				max={ args.max }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</>
 	);
diff --git a/projects/packages/videopress/src/client/components/video-frame-selector/index.jsx b/projects/packages/videopress/src/client/components/video-frame-selector/index.jsx
index e8a11a3ece9b0..96956831be630 100644
--- a/projects/packages/videopress/src/client/components/video-frame-selector/index.jsx
+++ b/projects/packages/videopress/src/client/components/video-frame-selector/index.jsx
@@ -82,6 +82,7 @@ const VideoFrameSelector = ( {
 				showTooltip={ false }
 				withInputField={ false }
 				onChange={ onRangeChange }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</div>
 	);
diff --git a/projects/plugins/boost/app/assets/src/js/features/image-cdn/image-cdn-liar/image-cdn-liar.tsx b/projects/plugins/boost/app/assets/src/js/features/image-cdn/image-cdn-liar/image-cdn-liar.tsx
index 11bf0de7ac51a..cfada6ae484fd 100644
--- a/projects/plugins/boost/app/assets/src/js/features/image-cdn/image-cdn-liar/image-cdn-liar.tsx
+++ b/projects/plugins/boost/app/assets/src/js/features/image-cdn/image-cdn-liar/image-cdn-liar.tsx
@@ -41,6 +41,7 @@ export default function ImageCdnLiar( { isPremium }: ImageCdnLiarProps ) {
 						className={ styles[ 'toggle-control' ] }
 						checked={ imageCdnLiar.data }
 						onChange={ handleToggle }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</div>
 			</div>
diff --git a/projects/plugins/boost/changelog/update-base-control-bottom-margin-style-deprecation b/projects/plugins/boost/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/plugins/jetpack/_inc/client/components/tree-selector/index.jsx b/projects/plugins/jetpack/_inc/client/components/tree-selector/index.jsx
index 1d643f039d55f..47a453109264c 100644
--- a/projects/plugins/jetpack/_inc/client/components/tree-selector/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/tree-selector/index.jsx
@@ -32,6 +32,7 @@ const TreeSelector = props => {
 				checked={ selectedItems.includes( item.id ) }
 				onChange={ toggleCheckbox( item.id ) }
 				disabled={ disabled }
+				__nextHasNoMarginBottom={ true }
 			/>
 			<label htmlFor={ `jp-tree-item-${ item.id }` }>
 				{ item.name }
diff --git a/projects/plugins/jetpack/changelog/update-base-control-bottom-margin-style-deprecation b/projects/plugins/jetpack/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..2877105f2a8a1
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-chat/components/feedback/index.js b/projects/plugins/jetpack/extensions/blocks/ai-chat/components/feedback/index.js
index 6bd5641c14a4b..7053f5df32556 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-chat/components/feedback/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-chat/components/feedback/index.js
@@ -89,6 +89,7 @@ export default function Feedback( { blogType, blogId, cacheKey, feedbackSubmitte
 								value={ feedback.comment }
 								disabled={ isSubmittingFeedback || feedbackSubmittedForThisQuestion }
 								onChange={ newComment => setFeedback( { ...feedback, comment: newComment } ) }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<Button
 								className="wp-block-button__link jetpack-ai-chat-feedback-submit"
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-chat/controls.js b/projects/plugins/jetpack/extensions/blocks/ai-chat/controls.js
index a28bc1e3a5a95..8ee4a64c26077 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-chat/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-chat/controls.js
@@ -26,6 +26,7 @@ export function AiChatControls( {
 						placeholder={ DEFAULT_PLACEHOLDER }
 						onChange={ newPlaceholder => setAttributes( { placeholder: newPlaceholder } ) }
 						value={ placeholder }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 			</InspectorControls>
@@ -38,24 +39,28 @@ export function AiChatControls( {
 					) }
 					value={ promptOverride }
 					onChange={ setPromptOverride }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ToggleControl
 					label={ __( 'Show copy answer button.', 'jetpack' ) }
 					help={ __( 'Allow users to easily copy the answer.', 'jetpack' ) }
 					checked={ showCopy }
 					onChange={ newCopy => setAttributes( { showCopy: newCopy } ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ToggleControl
 					label={ __( 'Show rating button.', 'jetpack' ) }
 					help={ __( 'Allow users to rate the answer and give feedback.', 'jetpack' ) }
 					checked={ showFeedback }
 					onChange={ newFeedback => setAttributes( { showFeedback: newFeedback } ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<ToggleControl
 					label={ __( 'Show list of sources.', 'jetpack' ) }
 					help={ __( 'Show used sources at the bottom of the answer.', 'jetpack' ) }
 					checked={ showSources }
 					onChange={ newSources => setAttributes( { showSources: newSources } ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 			</InspectorAdvancedControls>
 		</>
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-chat/edit.js b/projects/plugins/jetpack/extensions/blocks/ai-chat/edit.js
index 0a98ee091b878..f4420bb363c54 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-chat/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-chat/edit.js
@@ -44,6 +44,7 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 					className="jetpack-ai-chat-question-input"
 					placeholder={ placeholder }
 					disabled={ true }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<RichText
 					className="wp-block-button__link jetpack-ai-chat-question-button"
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-chat/question-answer.js b/projects/plugins/jetpack/extensions/blocks/ai-chat/question-answer.js
index dd409c4f0aa49..9c522d833c454 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-chat/question-answer.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-chat/question-answer.js
@@ -136,6 +136,7 @@ export default function QuestionAnswer( {
 						disabled={ ! animationDone || isLoading }
 						value={ question }
 						onChange={ newQuestion => setQuestion( newQuestion ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 
 					<Button
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
index 353a6cf445b1f..69e132bac97ed 100644
--- a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
@@ -149,11 +149,13 @@ function BloggingPromptEdit( { attributes, noticeOperations, noticeUI, setAttrib
 						label={ __( 'Show prompt label', 'jetpack' ) }
 						checked={ showLabel }
 						onChange={ onShowLabelChange }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						label={ __( 'Show other responses', 'jetpack' ) }
 						checked={ showResponses }
 						onChange={ onShowResponsesChange }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 			</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/blogroll/edit.js b/projects/plugins/jetpack/extensions/blocks/blogroll/edit.js
index 5842977a9e46f..62f383b95e085 100644
--- a/projects/plugins/jetpack/extensions/blocks/blogroll/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/blogroll/edit.js
@@ -109,21 +109,25 @@ export function BlogRollEdit( { className, attributes, setAttributes, clientId }
 						label={ __( 'Show avatar', 'jetpack' ) }
 						checked={ !! show_avatar }
 						onChange={ () => setAttributes( { show_avatar: ! show_avatar } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						label={ __( 'Show description', 'jetpack' ) }
 						checked={ !! show_description }
 						onChange={ () => setAttributes( { show_description: ! show_description } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						label={ __( 'Open links in a new window', 'jetpack' ) }
 						checked={ !! open_links_new_window }
 						onChange={ () => setAttributes( { open_links_new_window: ! open_links_new_window } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						label={ __( 'Hide my own sites', 'jetpack' ) }
 						checked={ !! ignore_user_blogs }
 						onChange={ () => setAttributes( { ignore_user_blogs: ! ignore_user_blogs } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 			</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/cookie-consent/edit.js b/projects/plugins/jetpack/extensions/blocks/cookie-consent/edit.js
index c3888dde0b75e..96efc1808d9a0 100644
--- a/projects/plugins/jetpack/extensions/blocks/cookie-consent/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/cookie-consent/edit.js
@@ -63,6 +63,7 @@ function CookieConsentBlockEdit( { clientId, attributes, setAttributes } ) {
 							},
 						] }
 						onChange={ alignValue => updateAlignment( alignValue ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<TextControl
 						label={ __( 'Consent Expiry Time (in days)', 'jetpack' ) }
@@ -71,6 +72,7 @@ function CookieConsentBlockEdit( { clientId, attributes, setAttributes } ) {
 						min="1"
 						max="365"
 						onChange={ value => setAttributes( { consentExpiryDays: parseInt( value ) } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<p>
 						{ __(
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/controls.js b/projects/plugins/jetpack/extensions/blocks/donations/controls.js
index 879453d199051..3adf2565c7680 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/controls.js
@@ -112,16 +112,19 @@ const Controls = props => {
 						checked={ monthlyDonation.show }
 						onChange={ value => toggleDonation( '1 month', value ) }
 						label={ __( 'Show monthly donations', 'jetpack' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						checked={ annualDonation.show }
 						onChange={ value => toggleDonation( '1 year', value ) }
 						label={ __( 'Show annual donations', 'jetpack' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						checked={ showCustomAmount }
 						onChange={ value => setAttributes( { showCustomAmount: value } ) }
 						label={ __( 'Show custom amount option', 'jetpack' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ExternalLink href={ `https://wordpress.com/earn/payments/${ getSiteFragment() }` }>
 						{ __( 'View donation earnings', 'jetpack' ) }
diff --git a/projects/plugins/jetpack/extensions/blocks/google-docs-embed/edit.js b/projects/plugins/jetpack/extensions/blocks/google-docs-embed/edit.js
index 39d4b6fd29c90..7766200b9e54e 100644
--- a/projects/plugins/jetpack/extensions/blocks/google-docs-embed/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/google-docs-embed/edit.js
@@ -185,6 +185,7 @@ const GsuiteBlockEdit = props => {
 							value={ aspectRatio }
 							options={ aspectRatios }
 							onChange={ value => setAttributes( { aspectRatio: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</PanelBody>
 				</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/like/edit.js b/projects/plugins/jetpack/extensions/blocks/like/edit.js
index 400d1f664048d..d76d9907b5b13 100644
--- a/projects/plugins/jetpack/extensions/blocks/like/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/like/edit.js
@@ -42,6 +42,7 @@ function LikeEdit( { attributes, setAttributes } ) {
 							onChange={ newValue => {
 								handleReblogSetting( newValue );
 							} }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</PanelBody>
 				) }
diff --git a/projects/plugins/jetpack/extensions/blocks/map/component/info-window/mapkit.js b/projects/plugins/jetpack/extensions/blocks/map/component/info-window/mapkit.js
index 601b0e51cc46b..0b4afa037b7c8 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/component/info-window/mapkit.js
+++ b/projects/plugins/jetpack/extensions/blocks/map/component/info-window/mapkit.js
@@ -52,6 +52,7 @@ const InfoWindow = () => {
 						label={ __( 'Marker Title', 'jetpack' ) }
 						value={ title }
 						onChange={ value => updateActiveMarker( { title: value } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<TextareaControl
 						className="wp-block-jetpack-map__marker-caption"
@@ -60,6 +61,7 @@ const InfoWindow = () => {
 						rows="2"
 						tag="textarea"
 						onChange={ value => updateActiveMarker( { caption: value } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<Button onClick={ deleteActiveMarker } className="wp-block-jetpack-map__delete-btn">
 						<Dashicon icon="trash" size="15" /> { __( 'Delete Marker', 'jetpack' ) }
diff --git a/projects/plugins/jetpack/extensions/blocks/map/component/mapbox.js b/projects/plugins/jetpack/extensions/blocks/map/component/mapbox.js
index 8cf064a8337e1..44f54c46fd91e 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/component/mapbox.js
+++ b/projects/plugins/jetpack/extensions/blocks/map/component/mapbox.js
@@ -74,6 +74,7 @@ export class MapBoxComponent extends Component {
 							label={ __( 'Marker Title', 'jetpack' ) }
 							value={ title }
 							onChange={ value => updateActiveMarker( { title: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 						<TextareaControl
 							className="wp-block-jetpack-map__marker-caption"
@@ -82,6 +83,7 @@ export class MapBoxComponent extends Component {
 							rows="2"
 							tag="textarea"
 							onChange={ value => updateActiveMarker( { caption: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 						<Button onClick={ deleteActiveMarker } className="wp-block-jetpack-map__delete-btn">
 							<Dashicon icon="trash" size="15" /> { __( 'Delete Marker', 'jetpack' ) }
diff --git a/projects/plugins/jetpack/extensions/blocks/map/location-search/mapbox.js b/projects/plugins/jetpack/extensions/blocks/map/location-search/mapbox.js
index d17a9dd07354a..96d79cbc7a170 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/location-search/mapbox.js
+++ b/projects/plugins/jetpack/extensions/blocks/map/location-search/mapbox.js
@@ -86,6 +86,7 @@ export class MapboxLocationSearch extends Component {
 								aria-owns={ listBoxId }
 								aria-activedescendant={ activeId }
 								onKeyDown={ onKeyDown }
+								__nextHasNoMarginBottom={ true }
 							/>
 						) }
 					</Lookup>
diff --git a/projects/plugins/jetpack/extensions/blocks/map/location-search/mapkit.js b/projects/plugins/jetpack/extensions/blocks/map/location-search/mapkit.js
index e8a9c7e259052..98f92a8a22473 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/location-search/mapkit.js
+++ b/projects/plugins/jetpack/extensions/blocks/map/location-search/mapkit.js
@@ -100,6 +100,7 @@ const MapkitLocationSearch = ( { label, onAddPoint } ) => {
 							aria-owns={ listBoxId }
 							aria-activedescendant={ activeId }
 							onKeyDown={ onKeyDown }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 				</Lookup>
diff --git a/projects/plugins/jetpack/extensions/blocks/map/locations/index.js b/projects/plugins/jetpack/extensions/blocks/map/locations/index.js
index 8fc5ce47ce769..fef88afeba34d 100644
--- a/projects/plugins/jetpack/extensions/blocks/map/locations/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/map/locations/index.js
@@ -43,12 +43,14 @@ export class Locations extends Component {
 					label="Marker Title"
 					value={ point.title }
 					onChange={ title => this.setMarkerField( 'title', title, index ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<TextareaControl
 					label="Marker Caption"
 					value={ point.caption }
 					rows="3"
 					onChange={ caption => this.setMarkerField( 'caption', caption, index ) }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<Button
 					data-id={ index }
diff --git a/projects/plugins/jetpack/extensions/blocks/opentable/edit.js b/projects/plugins/jetpack/extensions/blocks/opentable/edit.js
index 4ac453c675c73..2d3ba1cfe5bd9 100644
--- a/projects/plugins/jetpack/extensions/blocks/opentable/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/opentable/edit.js
@@ -193,12 +193,14 @@ function OpenTableEdit( {
 					checked={ iframe }
 					onChange={ () => setAttributes( { iframe: ! iframe } ) }
 					className="is-opentable"
+					__nextHasNoMarginBottom={ true }
 				/>
 				{ 'button' === style && (
 					<ToggleControl
 						label={ __( 'Remove button margin', 'jetpack' ) }
 						checked={ negativeMargin }
 						onChange={ () => setAttributes( { negativeMargin: ! negativeMargin } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				) }
 			</InspectorAdvancedControls>
@@ -210,11 +212,13 @@ function OpenTableEdit( {
 						value={ lang }
 						onChange={ newLang => setAttributes( { lang: newLang } ) }
 						options={ languageOptions }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<ToggleControl
 						label={ __( 'Open in a new window', 'jetpack' ) }
 						checked={ newtab }
 						onChange={ () => setAttributes( { newtab: ! newtab } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</PanelBody>
 			</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/opentable/restaurant-picker.js b/projects/plugins/jetpack/extensions/blocks/opentable/restaurant-picker.js
index 4d157ff17fcda..1f5ca035af271 100644
--- a/projects/plugins/jetpack/extensions/blocks/opentable/restaurant-picker.js
+++ b/projects/plugins/jetpack/extensions/blocks/opentable/restaurant-picker.js
@@ -43,6 +43,7 @@ export default function RestaurantPicker( props ) {
 			label={ _n( 'Restaurant', 'Restaurants', selectedRestaurants.length, 'jetpack' ) }
 			{ ...props }
 			onChange={ onChange }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js b/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
index 82ba94c8b8776..8273595db3cd4 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
@@ -276,6 +276,7 @@ const PodcastPlayerEdit = ( {
 						value={ state.editedUrl }
 						className={ 'components-placeholder__input' }
 						onChange={ editedUrl => dispatch( { type: actions.EDIT_URL, payload: editedUrl } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<Button variant="primary" type="submit">
 						{ __( 'Embed', 'jetpack' ) }
@@ -331,6 +332,7 @@ const PodcastPlayerEdit = ( {
 								max={ defaultMaxItems }
 								required
 								disabled={ !! selectedGuid }
+								__nextHasNoMarginBottom={ true }
 							/>
 						) }
 						{ ComboboxControl && (
@@ -341,24 +343,28 @@ const PodcastPlayerEdit = ( {
 								options={ state.feedData.options || [] }
 								label={ __( 'Episode', 'jetpack' ) }
 								onFilterValueChange={ noop }
+								__nextHasNoMarginBottom={ true }
 							/>
 						) }
 						<ToggleControl
 							label={ __( 'Show Cover Art', 'jetpack' ) }
 							checked={ showCoverArt }
 							onChange={ value => setAttributes( { showCoverArt: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 
 						<ToggleControl
 							label={ __( 'Show Episode Title', 'jetpack' ) }
 							checked={ showEpisodeTitle }
 							onChange={ value => setAttributes( { showEpisodeTitle: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 
 						<ToggleControl
 							label={ __( 'Show Episode Description', 'jetpack' ) }
 							checked={ showEpisodeDescription }
 							onChange={ value => setAttributes( { showEpisodeDescription: value } ) }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</PanelBody>
 					<PanelColorSettings
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/edit.js b/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/edit.js
index 3ad72a912fce5..24f969937440a 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/edit.js
@@ -27,6 +27,7 @@ function BorderPanel( { borderRadius = '', setAttributes } ) {
 				initialPosition={ INITIAL_BORDER_RADIUS_POSITION }
 				allowReset
 				onChange={ setBorderRadius }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</PanelBody>
 	);
diff --git a/projects/plugins/jetpack/extensions/blocks/rating-star/edit.js b/projects/plugins/jetpack/extensions/blocks/rating-star/edit.js
index b61363f081a1c..b567265ea03a0 100644
--- a/projects/plugins/jetpack/extensions/blocks/rating-star/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/rating-star/edit.js
@@ -85,6 +85,7 @@ export default Symbol =>
 							onChange={ setNewMaxRating }
 							min={ 2 }
 							max={ 10 }
+							__nextHasNoMarginBottom={ true }
 						/>
 						<PanelColorSettings
 							title={ __( 'Color Settings', 'jetpack' ) }
diff --git a/projects/plugins/jetpack/extensions/blocks/recipe/details/edit.js b/projects/plugins/jetpack/extensions/blocks/recipe/details/edit.js
index 06c9e54298bab..48ec83ee9969b 100644
--- a/projects/plugins/jetpack/extensions/blocks/recipe/details/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/recipe/details/edit.js
@@ -16,6 +16,7 @@ function RecipeDetailsEdit( { className, attributes, setAttributes } ) {
 					<TextControl
 						value={ prepTimeLabel }
 						onChange={ val => setAttributes( { prepTimeLabel: val } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<UnitControl
 						onChange={ val => setAttributes( { prepTime: val } ) }
@@ -29,6 +30,7 @@ function RecipeDetailsEdit( { className, attributes, setAttributes } ) {
 					<TextControl
 						value={ cookTimeLabel }
 						onChange={ val => setAttributes( { cookTimeLabel: val } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<UnitControl
 						onChange={ val => setAttributes( { cookTime: val } ) }
@@ -44,11 +46,13 @@ function RecipeDetailsEdit( { className, attributes, setAttributes } ) {
 					<TextControl
 						value={ servingsLabel }
 						onChange={ val => setAttributes( { servingsLabel: val } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<TextControl
 						type="number"
 						value={ servings }
 						onChange={ val => setAttributes( { servings: parseInt( val ) } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</div>
 				<div className="group">
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriber-login/edit.js b/projects/plugins/jetpack/extensions/blocks/subscriber-login/edit.js
index 307b9d41f74c0..fd6ff84a10eb7 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriber-login/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriber-login/edit.js
@@ -27,21 +27,32 @@ function SubscriberLoginEdit( { attributes, setAttributes } ) {
 						label={ __( 'Redirect to current URL', 'jetpack' ) }
 						checked={ redirectToCurrent }
 						onChange={ () => setAttributes( { redirectToCurrent: ! redirectToCurrent } ) }
+						__nextHasNoMarginBottom={ true }
 					/>
-					<BaseControl label={ __( 'Log in label', 'jetpack' ) } id={ logInInputId }>
+					<BaseControl
+						label={ __( 'Log in label', 'jetpack' ) }
+						id={ logInInputId }
+						__nextHasNoMarginBottom={ true }
+					>
 						<TextControl
 							placeholder={ __( 'Log in', 'jetpack' ) }
 							onChange={ value => setAttributes( { logInLabel: value } ) }
 							value={ logInLabel }
 							id={ logInInputId }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</BaseControl>
-					<BaseControl label={ __( 'Log out label', 'jetpack' ) } id={ logOutInputId }>
+					<BaseControl
+						label={ __( 'Log out label', 'jetpack' ) }
+						id={ logOutInputId }
+						__nextHasNoMarginBottom={ true }
+					>
 						<TextControl
 							placeholder={ __( 'Log out', 'jetpack' ) }
 							onChange={ value => setAttributes( { logOutLabel: value } ) }
 							value={ logOutLabel }
 							id={ logOutInputId }
+							__nextHasNoMarginBottom={ true }
 						/>
 					</BaseControl>
 					<ToggleControl
@@ -50,17 +61,20 @@ function SubscriberLoginEdit( { attributes, setAttributes } ) {
 						onChange={ () =>
 							setAttributes( { showManageSubscriptionsLink: ! showManageSubscriptionsLink } )
 						}
+						__nextHasNoMarginBottom={ true }
 					/>
 					{ showManageSubscriptionsLink && (
 						<BaseControl
 							label={ __( 'Manage subscription label', 'jetpack' ) }
 							id={ manageSubscriptionsInputId }
+							__nextHasNoMarginBottom={ true }
 						>
 							<TextControl
 								placeholder={ __( 'Manage subscription', 'jetpack' ) }
 								onChange={ value => setAttributes( { manageSubscriptionsLabel: value } ) }
 								value={ manageSubscriptionsLabel }
 								id={ manageSubscriptionsInputId }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</BaseControl>
 					) }
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/controls.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/controls.js
index 489521a445015..c324355f664bf 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/controls.js
@@ -70,6 +70,7 @@ export const TiledGalleryInspectorControls = ( {
 						onChange={ onColumnsChange }
 						min={ 1 }
 						max={ Math.min( MAX_COLUMNS, images.length ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 				) }
 				{ layoutStyle !== LAYOUT_CIRCLE && (
@@ -79,6 +80,7 @@ export const TiledGalleryInspectorControls = ( {
 						onChange={ onRoundedCornersChange }
 						min={ 0 }
 						max={ MAX_ROUNDED_CORNERS }
+						__nextHasNoMarginBottom={ true }
 					/>
 				) }
 				<SelectControl
@@ -86,6 +88,7 @@ export const TiledGalleryInspectorControls = ( {
 					value={ linkTo }
 					onChange={ onLinkToChange }
 					options={ linkOptions }
+					__nextHasNoMarginBottom={ true }
 				/>
 			</PanelBody>
 		</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/tock/edit.js b/projects/plugins/jetpack/extensions/blocks/tock/edit.js
index 8e5b2796b11ac..112ffe605de60 100644
--- a/projects/plugins/jetpack/extensions/blocks/tock/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/tock/edit.js
@@ -89,6 +89,7 @@ const UrlDropdown = ( { tockUrl, setEditedUrl, setUrl, cancel } ) => {
 								b: <strong />,
 							}
 						) }
+						__nextHasNoMarginBottom={ true }
 					>
 						<div className="jetpack-tock-url-input-wrapper">
 							<TextControl
@@ -97,6 +98,7 @@ const UrlDropdown = ( { tockUrl, setEditedUrl, setUrl, cancel } ) => {
 								value={ tockUrl }
 								onKeyDownCapture={ event => handleSubmitOrCancel( event, onClose ) }
 								className="jetpack-tock-url-input"
+								__nextHasNoMarginBottom={ true }
 							/>
 							<div className="jetpack-tock-url-input-action">
 								<Button
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js
index ac008dd090fd4..3a19c1e7bdff4 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js
@@ -515,6 +515,7 @@ const VideoPressEdit = CoreVideoEdit =>
 								onChange={ this.toggleAttribute( 'autoplay' ) }
 								checked={ autoplay }
 								help={ this.getAutoplayHelp }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<ToggleControl
 								label={ this.renderControlLabelWithTooltip(
@@ -524,11 +525,13 @@ const VideoPressEdit = CoreVideoEdit =>
 								) }
 								onChange={ this.toggleAttribute( 'loop' ) }
 								checked={ loop }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<ToggleControl
 								label={ __( 'Muted', 'jetpack' ) }
 								onChange={ this.toggleAttribute( 'muted' ) }
 								checked={ muted }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<ToggleControl
 								label={ this.renderControlLabelWithTooltip(
@@ -538,6 +541,7 @@ const VideoPressEdit = CoreVideoEdit =>
 								) }
 								onChange={ this.toggleAttribute( 'controls' ) }
 								checked={ controls }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<ToggleControl
 								label={ this.renderControlLabelWithTooltip(
@@ -547,6 +551,7 @@ const VideoPressEdit = CoreVideoEdit =>
 								) }
 								onChange={ this.toggleAttribute( 'playsinline' ) }
 								checked={ playsinline }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<SelectControl
 								label={ this.renderControlLabelWithTooltip(
@@ -565,6 +570,7 @@ const VideoPressEdit = CoreVideoEdit =>
 									{ value: 'none', label: _x( 'None', 'VideoPress preload setting', 'jetpack' ) },
 								] }
 								help={ this.getPreloadHelp() }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<MediaUploadCheck>
 								<BaseControl className="editor-video-poster-control">
@@ -649,6 +655,7 @@ const VideoPressEdit = CoreVideoEdit =>
 									},
 								] }
 								onChange={ this.onChangeRating }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<ToggleControl
 								label={ this.renderControlLabelWithTooltip(
@@ -662,6 +669,7 @@ const VideoPressEdit = CoreVideoEdit =>
 								onChange={ this.onChangeAllowDownload }
 								checked={ allowDownload }
 								disabled={ isFetchingMedia || isUpdatingAllowDownload }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<SelectControl
 								label={ __( 'Video Privacy', 'jetpack' ) }
@@ -683,6 +691,7 @@ const VideoPressEdit = CoreVideoEdit =>
 									},
 								] }
 								disabled={ isFetchingMedia || isUpdatingPrivacySetting }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</PanelBody>
 					</InspectorControls>
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/seekbar-color-settings.js b/projects/plugins/jetpack/extensions/blocks/videopress/seekbar-color-settings.js
index a8b54790d2a69..2d3e1bbc28513 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/seekbar-color-settings.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/seekbar-color-settings.js
@@ -45,6 +45,7 @@ class SeekbarColorSettings extends Component {
 					help={ __( 'Colors adapt to the video as it plays', 'jetpack' ) }
 					onChange={ toggleAttribute( 'useAverageColor' ) }
 					checked={ useAverageColor }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<PanelColorSettings
 					opened={ ! useAverageColor }
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/tracks-editor.js b/projects/plugins/jetpack/extensions/blocks/videopress/tracks-editor.js
index 8b4cc514df789..e03f416b34eb1 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/tracks-editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/tracks-editor.js
@@ -301,6 +301,7 @@ function SingleTrackEditor( { track, guid, onChange, onClose, onCancel, trackExi
 						value={ label }
 						help={ __( 'Title of track', 'jetpack' ) }
 						disabled={ isSavingTrack }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<TextControl
 						onChange={ newSrcLang =>
@@ -313,6 +314,7 @@ function SingleTrackEditor( { track, guid, onChange, onClose, onCancel, trackExi
 						value={ srcLang }
 						help={ __( 'Language tag (en, fr, etc.)', 'jetpack' ) }
 						disabled={ isSavingTrack }
+						__nextHasNoMarginBottom={ true }
 					/>
 				</div>
 				<SelectControl
@@ -330,6 +332,7 @@ function SingleTrackEditor( { track, guid, onChange, onClose, onCancel, trackExi
 						} );
 					} }
 					disabled={ isSavingTrack }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<div className="videopress-block-tracks-editor__single-track-editor-buttons-container">
 					{ isSavingTrack ? (
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/uploading-editor/index.js b/projects/plugins/jetpack/extensions/blocks/videopress/uploading-editor/index.js
index 23447babdc06d..8030003a309f5 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/uploading-editor/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/uploading-editor/index.js
@@ -127,9 +127,10 @@ export const UploadingEditor = props => {
 						className="uploading-editor__title"
 						onChange={ onChangeTitle }
 						value={ title }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<div className="uploading-editor__content">
-						<BaseControl>
+						<BaseControl __nextHasNoMarginBottom={ true }>
 							<BaseControl.VisualLabel>
 								{ __( 'Video poster (optional)', 'jetpack' ) }
 							</BaseControl.VisualLabel>
@@ -167,6 +168,7 @@ export const UploadingEditor = props => {
 											showTooltip={ false }
 											withInputField={ false }
 											onChange={ onRangeChange }
+											__nextHasNoMarginBottom={ true }
 										/>
 									</span>
 									<span className="uploading-editor__scrubber-help" style={ posterSelectedStyle }>
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
index c3d44c1491ac5..657e849e86e14 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
@@ -82,7 +82,7 @@ const JetpackAndSettingsContent = ( {
 		<>
 			{ showFairUsageNotice && (
 				<PanelRow className="jetpack-ai-sidebar__feature-section">
-					<BaseControl>
+					<BaseControl __nextHasNoMarginBottom={ true }>
 						<FairUsageNotice variant="muted" />
 					</BaseControl>
 				</PanelRow>
@@ -90,7 +90,7 @@ const JetpackAndSettingsContent = ( {
 
 			{ canWriteBriefBeEnabled() && isBreveAvailable && (
 				<PanelRow>
-					<BaseControl>
+					<BaseControl __nextHasNoMarginBottom={ true }>
 						<BaseControl.VisualLabel>
 							{ __( 'Write Brief with AI (BETA)', 'jetpack' ) }
 						</BaseControl.VisualLabel>
@@ -100,7 +100,7 @@ const JetpackAndSettingsContent = ( {
 			) }
 
 			<PanelRow className="jetpack-ai-sidebar__feature-section">
-				<BaseControl>
+				<BaseControl __nextHasNoMarginBottom={ true }>
 					<BaseControl.VisualLabel>{ __( 'AI Feedback', 'jetpack' ) }</BaseControl.VisualLabel>
 					<Feedback placement={ placement } busy={ false } disabled={ requireUpgrade } />
 				</BaseControl>
@@ -108,7 +108,7 @@ const JetpackAndSettingsContent = ( {
 
 			{ isAITitleOptimizationAvailable && (
 				<PanelRow className="jetpack-ai-sidebar__feature-section">
-					<BaseControl>
+					<BaseControl __nextHasNoMarginBottom={ true }>
 						<BaseControl.VisualLabel>{ titleOptimizationSectionLabel }</BaseControl.VisualLabel>
 						<TitleOptimization placement={ placement } busy={ false } disabled={ requireUpgrade } />
 					</BaseControl>
@@ -116,7 +116,7 @@ const JetpackAndSettingsContent = ( {
 			) }
 			{ isAIFeaturedImageAvailable && (
 				<PanelRow className="jetpack-ai-sidebar__feature-section">
-					<BaseControl>
+					<BaseControl __nextHasNoMarginBottom={ true }>
 						<BaseControl.VisualLabel>
 							{ __( 'AI Featured Image', 'jetpack' ) }
 						</BaseControl.VisualLabel>
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/controls.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/controls.tsx
index fc39f31a05d04..f9762e6d85e28 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/controls.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/controls.tsx
@@ -105,7 +105,7 @@ const Controls = ( { blocks, disabledFeatures } ) => {
 		<div className="jetpack-ai-proofread">
 			<p> { __( 'Improve your writing with AI.', 'jetpack' ) }</p>
 			<PanelRow>
-				<BaseControl>
+				<BaseControl __nextHasNoMarginBottom={ true }>
 					<div className="grade-level-container">
 						{ gradeLevel === null ? (
 							<p className="jetpack-ai-proofread__help-text">
@@ -126,11 +126,12 @@ const Controls = ( { blocks, disabledFeatures } ) => {
 			</PanelRow>
 
 			<PanelRow>
-				<BaseControl>
+				<BaseControl __nextHasNoMarginBottom={ true }>
 					<ToggleControl
 						checked={ isProofreadEnabled }
 						onChange={ handleAiFeedbackToggle }
 						label={ __( 'Show suggestions', 'jetpack' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<div className="feature-checkboxes-container">
 						{ features.map(
@@ -144,6 +145,7 @@ const Controls = ( { blocks, disabledFeatures } ) => {
 										label={ feature.config.title }
 										checked={ ! disabledFeatures.includes( feature.config.name ) }
 										onChange={ handleToggleFeature( feature.config.name ) }
+										__nextHasNoMarginBottom={ true }
 									/>
 								)
 						) }
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-bar/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-bar/index.tsx
index 13499251344f0..0fc83f7523698 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-bar/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-bar/index.tsx
@@ -121,7 +121,7 @@ function UsageControl( {
 	);
 
 	return (
-		<BaseControl help={ help }>
+		<BaseControl __nextHasNoMarginBottom={ true } help={ help }>
 			<BaseControl.VisualLabel>{ __( 'Available Requests', 'jetpack' ) }</BaseControl.VisualLabel>
 			{ ! loading && usageDisplay }
 			{ loading && loadingPlaceholder }
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/components/ai-excerpt-control/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/components/ai-excerpt-control/index.tsx
index 692c30e32761d..f38c9a4d30eb4 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/components/ai-excerpt-control/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/components/ai-excerpt-control/index.tsx
@@ -90,7 +90,10 @@ export function AiExcerptControl( {
 
 	return (
 		<div className="jetpack-ai-generate-excerpt-control">
-			<BaseControl className="jetpack-ai-generate-excerpt-control__header">
+			<BaseControl
+				className="jetpack-ai-generate-excerpt-control__header"
+				__nextHasNoMarginBottom={ true }
+			>
 				<BaseControl.VisualLabel>{ __( 'Settings', 'jetpack' ) }</BaseControl.VisualLabel>
 				<Button
 					label={ __( 'Advanced AI options', 'jetpack' ) }
@@ -131,6 +134,7 @@ export function AiExcerptControl( {
 				) }
 				showTooltip={ false }
 				disabled={ disabled }
+				__nextHasNoMarginBottom={ true }
 			/>
 		</div>
 	);
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/extend/ai-post-excerpt/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/extend/ai-post-excerpt/index.tsx
index 141021b22fad7..0c6758b7b4bb4 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/extend/ai-post-excerpt/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/extend/ai-post-excerpt/index.tsx
@@ -263,6 +263,7 @@ ${ postContent }
 					help={
 						! postContent?.length ? __( 'Add content to generate an excerpt.', 'jetpack' ) : null
 					}
+					__nextHasNoMarginBottom={ true }
 				>
 					<div className="jetpack-generated-excerpt__generate-buttons-container">
 						<Button
diff --git a/projects/plugins/jetpack/extensions/plugins/likes/likes-checkbox.js b/projects/plugins/jetpack/extensions/plugins/likes/likes-checkbox.js
index 98fa7738a8896..95a714ad5d2d1 100644
--- a/projects/plugins/jetpack/extensions/plugins/likes/likes-checkbox.js
+++ b/projects/plugins/jetpack/extensions/plugins/likes/likes-checkbox.js
@@ -39,6 +39,7 @@ const LikesCheckbox = ( { areLikesEnabled, editPost } ) => {
 					onChange={ value => {
 						editPost( { jetpack_likes_enabled: value } );
 					} }
+					__nextHasNoMarginBottom={ true }
 				/>
 			</JetpackLikesAndSharingPanel>
 		</PostTypeSupportCheck>
diff --git a/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js b/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js
index 4e21e80740265..5822775b803ff 100644
--- a/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js
+++ b/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js
@@ -22,7 +22,13 @@ export const CountedTextArea = ( { suggestedLimit, value, label, ...inputProps }
 
 	return (
 		<div className="jetpack-seo-message-box">
-			<TextareaControl label={ label } help={ help } value={ value } { ...inputProps } />
+			<TextareaControl
+				__nextHasNoMarginBottom={ true }
+				label={ label }
+				help={ help }
+				value={ value }
+				{ ...inputProps }
+			/>
 		</div>
 	);
 };
diff --git a/projects/plugins/jetpack/extensions/plugins/seo/noindex-panel.js b/projects/plugins/jetpack/extensions/plugins/seo/noindex-panel.js
index 6f1abefebc340..96c51dfce7289 100644
--- a/projects/plugins/jetpack/extensions/plugins/seo/noindex-panel.js
+++ b/projects/plugins/jetpack/extensions/plugins/seo/noindex-panel.js
@@ -17,6 +17,7 @@ const SeoNoindexPanel = ( { metaValue, updateMetaValue } ) => {
 			) }
 			checked={ !! metaValue }
 			onChange={ onCheckboxChange }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 };
diff --git a/projects/plugins/jetpack/extensions/plugins/sharing/components/show-sharing-control/index.js b/projects/plugins/jetpack/extensions/plugins/sharing/components/show-sharing-control/index.js
index 0b3820a75e15e..d739de1276826 100644
--- a/projects/plugins/jetpack/extensions/plugins/sharing/components/show-sharing-control/index.js
+++ b/projects/plugins/jetpack/extensions/plugins/sharing/components/show-sharing-control/index.js
@@ -15,6 +15,7 @@ function ShowSharingCheckbox( { checked, onChange } ) {
 			onChange={ value => {
 				onChange( { jetpack_sharing_enabled: value } );
 			} }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 }
diff --git a/projects/plugins/jetpack/extensions/shared/clipboard-input.js b/projects/plugins/jetpack/extensions/shared/clipboard-input.js
index 09e2db0c591ec..ed49e42fd91ee 100644
--- a/projects/plugins/jetpack/extensions/shared/clipboard-input.js
+++ b/projects/plugins/jetpack/extensions/shared/clipboard-input.js
@@ -25,7 +25,12 @@ class ClipboardInput extends Component {
 
 		return (
 			<div className="jetpack-clipboard-input">
-				<TextControl readOnly onFocus={ this.onFocus } value={ link } />
+				<TextControl
+					readOnly
+					onFocus={ this.onFocus }
+					value={ link }
+					__nextHasNoMarginBottom={ true }
+				/>
 				<ClipboardButton
 					variant="secondary"
 					onCopy={ this.onCopy }
diff --git a/projects/plugins/jetpack/extensions/shared/components/ai-model-selector-control/index.tsx b/projects/plugins/jetpack/extensions/shared/components/ai-model-selector-control/index.tsx
index 81afe48723a1b..680c11162853a 100644
--- a/projects/plugins/jetpack/extensions/shared/components/ai-model-selector-control/index.tsx
+++ b/projects/plugins/jetpack/extensions/shared/components/ai-model-selector-control/index.tsx
@@ -62,6 +62,7 @@ export default function AiModelSelectorControl( {
 			value={ model }
 			disabled={ disabled }
 			help={ help }
+			__nextHasNoMarginBottom={ true }
 		>
 			<ToggleGroupControlOption
 				label={ __( 'GTP-3.5 Turbo', 'jetpack' ) }
diff --git a/projects/plugins/jetpack/extensions/shared/components/product-management-controls/inspector-control.js b/projects/plugins/jetpack/extensions/shared/components/product-management-controls/inspector-control.js
index e223c27ee70fc..57543898b927c 100644
--- a/projects/plugins/jetpack/extensions/shared/components/product-management-controls/inspector-control.js
+++ b/projects/plugins/jetpack/extensions/shared/components/product-management-controls/inspector-control.js
@@ -119,6 +119,7 @@ export default function ProductManagementInspectorControl() {
 									setIsCustomTitle( true );
 								} }
 								value={ title }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</PanelRow>
 						<PanelRow className="product-management-control-inspector__product-price">
@@ -127,12 +128,14 @@ export default function ProductManagementInspectorControl() {
 								onChange={ value => setCurrency( value ) }
 								options={ CURRENCY_OPTIONS }
 								value={ currency }
+								__nextHasNoMarginBottom={ true }
 							/>
 							<TextControl
 								label={ __( 'Price', 'jetpack' ) }
 								onChange={ value => setPrice( value ) }
 								type="number"
 								value={ price }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</PanelRow>
 						<PanelRow className="plan-interval">
@@ -141,6 +144,7 @@ export default function ProductManagementInspectorControl() {
 								onChange={ value => setInterval( value ) }
 								options={ intervalOptions }
 								value={ interval }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</PanelRow>
 						<PanelRow className="custom-amount">
@@ -148,6 +152,7 @@ export default function ProductManagementInspectorControl() {
 								label={ __( 'Enable customers to pick their own amount', 'jetpack' ) }
 								onChange={ value => setIsCustomAmount( value ) }
 								checked={ isCustomAmount }
+								__nextHasNoMarginBottom={ true }
 							/>
 						</PanelRow>
 						<PanelRow>
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-option.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-option.js
index 13ff7ac64c34f..fe7d499c94d34 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-option.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-option.js
@@ -19,6 +19,7 @@ function CategoryOption( { value, updateFilter } ) {
 			value={ value }
 			options={ GOOGLE_PHOTOS_CATEGORIES }
 			onChange={ updateFilter }
+			__nextHasNoMarginBottom={ true }
 		/>
 	);
 }
@@ -36,6 +37,7 @@ function DateOption( { value, updateFilter } ) {
 				value={ selectedRange }
 				options={ GOOGLE_PHOTOS_DATE_PRESETS }
 				onChange={ range => updateFilter( { range } ) }
+				__nextHasNoMarginBottom={ true }
 			/>
 			{ selectedRange === DATE_RANGE_CUSTOM && (
 				<Fragment>
@@ -44,6 +46,7 @@ function DateOption( { value, updateFilter } ) {
 						value={ month }
 						options={ MONTH_SELECT_OPTIONS }
 						onChange={ setMonth }
+						__nextHasNoMarginBottom={ true }
 					/>
 					<NumberControl
 						className="components-base-control"
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-view.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-view.js
index 650457364babe..d69d2bc2103c8 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-view.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/filter-view.js
@@ -61,6 +61,7 @@ function GoogleFilterView( props ) {
 				disabled={ isLoading || isCopying }
 				options={ remainingFilters }
 				onChange={ setCurrentFilter }
+				__nextHasNoMarginBottom={ true }
 			/>
 
 			<Button disabled={ isLoading || isCopying } variant="secondary" isSmall onClick={ setFilter }>
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-media.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-media.js
index e4f0d529a0578..fd35fbc11a588 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-media.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-media.js
@@ -96,6 +96,7 @@ function GooglePhotosMedia( props ) {
 					disabled={ isLoading || isCopying }
 					options={ PATH_OPTIONS }
 					onChange={ setPath }
+					__nextHasNoMarginBottom={ true }
 				/>
 
 				{ showAdditionalFilters && path.ID === PATH_RECENT && (
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/openverse.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/openverse.js
index db5b9b4ac09c8..abf2a66aa0a38 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/openverse.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/openverse.js
@@ -81,6 +81,7 @@ function OpenverseMedia( props ) {
 					value={ searchQuery }
 					onChange={ setSearchQuery }
 					disabled={ !! isCopying }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<Button
 					isPrimary
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
index f3676c1ea58b5..cdd97bc355e8d 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
@@ -83,6 +83,7 @@ function PexelsMedia( props ) {
 					value={ searchQuery }
 					onChange={ setSearchQuery }
 					disabled={ !! isCopying }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<Button
 					variant="primary"
diff --git a/projects/plugins/jetpack/extensions/shared/memberships/settings.js b/projects/plugins/jetpack/extensions/shared/memberships/settings.js
index 803b7772b0546..b8db92f7f9523 100644
--- a/projects/plugins/jetpack/extensions/shared/memberships/settings.js
+++ b/projects/plugins/jetpack/extensions/shared/memberships/settings.js
@@ -327,6 +327,7 @@ export function NewsletterEmailDocumentSettings() {
 						disabled={ isPostPublished || ! canEdit }
 						onChange={ toggleSendEmail }
 						isBlock
+						__nextHasNoMarginBottom={ true }
 					>
 						<ToggleGroupControlOption label={ __( 'Post & email', 'jetpack' ) } value={ true } />
 						<ToggleGroupControlOption label={ __( 'Post only', 'jetpack' ) } value={ false } />
diff --git a/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx b/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
index 3800a1e5f62ad..f2f19b5e73813 100644
--- a/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
+++ b/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
@@ -387,6 +387,7 @@ const visibilityAdvancedControls = createHigherOrderComponent(
 							label={ __( 'Match all rules', 'jetpack' ) }
 							checked={ conditions.match_all === '1' }
 							onChange={ toggleMatchAll }
+							__nextHasNoMarginBottom={ true }
 						/>
 					) }
 					<Button variant="secondary" onClick={ addNewRule }>
diff --git a/projects/plugins/protect/changelog/update-base-control-bottom-margin-style-deprecation b/projects/plugins/protect/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx b/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx
index abc7b0cf02c13..d23055afb14b3 100644
--- a/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx
+++ b/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx
@@ -76,6 +76,7 @@ const ShareDebugData = () => {
 					checked={ Boolean( settings.jetpack_waf_share_debug_data ) }
 					onChange={ handleShareDebugDataChange }
 					disabled={ isUpdating }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<Text>
 					{ __(
@@ -120,6 +121,7 @@ const ShareData = () => {
 					checked={ Boolean( settings.jetpack_waf_share_data ) }
 					onChange={ handleShareDataChange }
 					disabled={ isUpdating }
+					__nextHasNoMarginBottom={ true }
 				/>
 				<Text>
 					{ __(
diff --git a/projects/plugins/social/changelog/update-base-control-bottom-margin-style-deprecation b/projects/plugins/social/changelog/update-base-control-bottom-margin-style-deprecation
new file mode 100644
index 0000000000000..b15eec1ee9e9a
--- /dev/null
+++ b/projects/plugins/social/changelog/update-base-control-bottom-margin-style-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
diff --git a/projects/plugins/social/src/js/components/social-notes-toggle/index.tsx b/projects/plugins/social/src/js/components/social-notes-toggle/index.tsx
index fd3f23628941b..c9787ba1604d4 100644
--- a/projects/plugins/social/src/js/components/social-notes-toggle/index.tsx
+++ b/projects/plugins/social/src/js/components/social-notes-toggle/index.tsx
@@ -125,6 +125,7 @@ const SocialNotesToggle: React.FC< SocialNotesToggleProps > = ( { disabled } ) =
 						className={ styles.toggle }
 						onChange={ onToggleAppendLink }
 						help={ __( 'Whether to append the post link when sharing a note.', 'jetpack-social' ) }
+						__nextHasNoMarginBottom={ true }
 					/>
 					{ appendLink && ! isAppendLinkToggleUpdating ? (
 						<SelectControl
@@ -149,6 +150,7 @@ const SocialNotesToggle: React.FC< SocialNotesToggleProps > = ( { disabled } ) =
 									</ExternalLink>
 								</span>
 							}
+							__nextHasNoMarginBottom={ true }
 						/>
 					) : null }
 				</div>
diff --git a/projects/plugins/social/src/js/components/toggle-section/index.tsx b/projects/plugins/social/src/js/components/toggle-section/index.tsx
index 925098de933c4..a896c11450af3 100644
--- a/projects/plugins/social/src/js/components/toggle-section/index.tsx
+++ b/projects/plugins/social/src/js/components/toggle-section/index.tsx
@@ -20,6 +20,7 @@ const ToggleSection: React.FC< ToggleSectionProps > = ( {
 				disabled={ disabled }
 				checked={ checked }
 				onChange={ onChange }
+				__nextHasNoMarginBottom={ true }
 			/>
 			<Text className={ styles.title } variant="title-medium">
 				{ title }