diff --git a/plugins/woocommerce-admin/images/admin_notes/img-product-light.png b/plugins/woocommerce-admin/images/admin_notes/img-product-light.png
new file mode 100644
index 00000000000..3ecc1c2341e
Binary files /dev/null and b/plugins/woocommerce-admin/images/admin_notes/img-product-light.png differ
diff --git a/plugins/woocommerce-admin/includes/emails/html-merchant-notification.php b/plugins/woocommerce-admin/includes/emails/html-merchant-notification.php
new file mode 100644
index 00000000000..9509cbcc901
--- /dev/null
+++ b/plugins/woocommerce-admin/includes/emails/html-merchant-notification.php
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+ array(
+ 'href' => array(),
+ 'title' => array(),
+ ),
+ 'br' => array(),
+ 'em' => array(),
+ 'strong' => array(),
+ )
+);
+
+$base_color = get_option( 'woocommerce_email_base_color' );
+$base_text = wc_light_or_dark( $base_color, '#202020', '#ffffff' );
+$container_styles = 'margin-top: 25px;';
+$buttons_styles = "
+ font-style: normal;
+ font-weight: normal;
+ font-size: 13px;
+ line-height: 18px;
+ text-align: center;
+ color: {$base_text};
+ margin-right: 15px;
+ text-decoration: none;
+ background: {$base_color};
+ border: 1px solid {$base_color};
+ border-radius: 3px;
+ padding: 5px;";
+?>
+
+
+
+
+label, $trigger_note_action_url . $an_action->id ) );
+}
+echo "\n\n----------------------------------------\n\n";
+
+echo wp_kses_post( apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) ) );
diff --git a/plugins/woocommerce-admin/packages/data/src/constants.js b/plugins/woocommerce-admin/packages/data/src/constants.js
index 4839bc0dd56..82764e56bac 100644
--- a/plugins/woocommerce-admin/packages/data/src/constants.js
+++ b/plugins/woocommerce-admin/packages/data/src/constants.js
@@ -24,4 +24,5 @@ export const QUERY_DEFAULTS = {
pageSize: 25,
period: 'month',
compare: 'previous_year',
+ noteTypes: [ 'info', 'marketing', 'survey', 'warning' ],
};
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index e24c035aec4..395cdf1b4c5 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -89,6 +89,8 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
- Add: Welcome modal when coming from Calypso #6004
- Enhancement: Add an a/b experiment for installing free business features #5786
- Dev: Add `onChangeCallback` feature to the wc-admin