diff --git a/plugins/woocommerce-blocks/docs/testing/releases/640.md b/plugins/woocommerce-blocks/docs/testing/releases/640.md
new file mode 100644
index 00000000000..7a3759843bf
--- /dev/null
+++ b/plugins/woocommerce-blocks/docs/testing/releases/640.md
@@ -0,0 +1,60 @@
+## Testing notes and ZIP for release 6.4.0
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-gutenberg-products-block/files/7581080/woocommerce-gutenberg-products-block.zip)
+
+## Feature Plugin
+
+### Switch variables round in the error message of `mustContain` validation function. ([5155](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5155))
+
+1. Install the [Simple Custom CSS and JS](https://wordpress.org/plugins/custom-css-js/) plugin and, inside its settings, add this JS code to the footer:
+```js
+wc.blocksCheckout.__experimentalRegisterCheckoutFilters( 'my-test-extension', {
+ subtotalPriceFormat: ( value ) => 'test',
+ } );
+```
+2. Visit the Cart or Checkout block and ensure the error message reads `Error: Returned value must include "", you passed "test"`
+3. Change the code to
+```js
+wc.blocksCheckout.__experimentalRegisterCheckoutFilters( 'my-test-extension', {
+ subtotalPriceFormat: ( value ) => 'test',
+ } );
+```
+4. Reload the page and verify the Cart and Checkout block loads correctly.
+
+
+
+### Lazy load missing translation files. ([5112](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5112))
+1. Switch the site language to Spanish.
+2. Update the translations via `WP Admin → Dashboard → Translations → Update Translations`.
+3. Create a test page, add the Checkout block and save it.
+4. Ensure that the _"Terms and conditions"_ text in the editor is in Spanish.
+5. Look up the frontend and verify that the _"Terms and conditions"_ text is in Spanish (see screenshot).
+6. Switch the site language to German and repeat steps 2. until 5. (texts should then appear in German)
+
+
+
+
+
+### Checkout Terms Block: Fix Terms and Conditions checkbox position in editor. ([5191](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5191))
+1. Go to the post editor.
+2. Add Checkout block.
+3. Select **Terms and Conditions** child block.
+4. Activate `Require checkbox` display option.
+5. Confirm that the checkbox is aligned to the top of the paragraph.
+
+
+
+## Feature plugin and package inclusion in WooCommerce
+
+### Fix manual entry within Quantity Inputs. ([5197](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5197))
+- Add a product to your cart.
+- Go to a page with the Cart block.
+- Try typing a quantity into the line item.
+- Totals should update.
+- Try typing a letter. Input should be ignored and reset to `1`.
+
+### Feature gate WC Block Templates to WC v6.0.0. ([5210](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5210))
+1. Install and activate version 11.9.1 of [the Gutenberg plugin](https://wordpress.org/plugins/gutenberg/).
+2. Install and activate a FSE enabled theme, such as [the TT1 Blocks theme](https://wordpress.org/themes/tt1-blocks/).
+3. In WC 5.9, check that block templates are not loading. You can verify that going to a single product page (ie: Cap) and verify that contents don't appear twice.
+4. Also check the templates are not loading in the Site Editor (Appearance > Editor > Templates > General templates -- if this last folder doesn't exist, that means this is testing well).
diff --git a/plugins/woocommerce-blocks/docs/testing/releases/README.md b/plugins/woocommerce-blocks/docs/testing/releases/README.md
index f45fce27ce8..8d65fb105e4 100644
--- a/plugins/woocommerce-blocks/docs/testing/releases/README.md
+++ b/plugins/woocommerce-blocks/docs/testing/releases/README.md
@@ -49,4 +49,5 @@ Every release includes specific testing instructions for new features and bug fi
- [6.2.0](./620.md)
- [6.3.0](./630.md)
- [6.3.1](./631.md)
- - [6.3.2](./632.md)
\ No newline at end of file
+ - [6.3.2](./632.md)
+- [6.4.0](./640.md)
\ No newline at end of file
diff --git a/plugins/woocommerce-blocks/package.json b/plugins/woocommerce-blocks/package.json
index e0fb143b9ba..0d403b15328 100644
--- a/plugins/woocommerce-blocks/package.json
+++ b/plugins/woocommerce-blocks/package.json
@@ -2,7 +2,7 @@
"name": "@woocommerce/block-library",
"title": "WooCommerce Blocks",
"author": "Automattic",
- "version": "6.4.0-dev",
+ "version": "6.4.0",
"description": "WooCommerce blocks for the Gutenberg editor.",
"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
"keywords": [
diff --git a/plugins/woocommerce-blocks/readme.txt b/plugins/woocommerce-blocks/readme.txt
index 351271a08c4..b010680174f 100644
--- a/plugins/woocommerce-blocks/readme.txt
+++ b/plugins/woocommerce-blocks/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
Requires at least: 5.8
Tested up to: 5.8
Requires PHP: 7.0
-Stable tag: 6.4.0-dev
+Stable tag: 6.4.0
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -85,6 +85,22 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
== Changelog ==
+= 6.4.0 - 2021-11-22 =
+
+#### Enhancements
+
+- Pass to payment methods a wrapper component that handles the loading state. ([5135](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5135))
+
+#### Bugfixes
+
+- Gate WC template editing (FSE) to versions of WC 6.0 or higher. ([5210](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5210))
+- Fix manual entry within Quantity Inputs in Cart block. ([5197](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5197))
+- Correctly align Terms and Conditions block checkbox in Checkout block. ([5191](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5191))
+- Add support for decimal and thousand separators in the `formatPrice` function. ([5188](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5188))
+- Reduce the size of the checkbox component label to prevent accidental input. ([5164](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5164))
+- Lazy load missing translation files on frontend to ensure that all visible texts are translatable. ([5112](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5112))
+
+
= 6.3.2 - 2021-11-17 =
#### Enhancements
diff --git a/plugins/woocommerce-blocks/src/Package.php b/plugins/woocommerce-blocks/src/Package.php
index 8cdd4410c04..0ad61b8edba 100644
--- a/plugins/woocommerce-blocks/src/Package.php
+++ b/plugins/woocommerce-blocks/src/Package.php
@@ -106,7 +106,7 @@ class Package {
NewPackage::class,
function ( $container ) {
// leave for automated version bumping.
- $version = '6.4.0-dev';
+ $version = '6.4.0';
return new NewPackage(
$version,
dirname( __DIR__ ),
diff --git a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php b/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php
index 9360bb8fe18..c36b0b9ebdd 100644
--- a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php
+++ b/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php
@@ -3,14 +3,14 @@
* Plugin Name: WooCommerce Blocks
* Plugin URI: https://github.com/woocommerce/woocommerce-gutenberg-products-block
* Description: WooCommerce blocks for the Gutenberg editor.
- * Version: 6.4.0-dev
+ * Version: 6.4.0
* Author: Automattic
* Author URI: https://woocommerce.com
* Text Domain: woo-gutenberg-products-block
* Requires at least: 5.8
* Requires PHP: 7.0
- * WC requires at least: 5.7
- * WC tested up to: 5.7
+ * WC requires at least: 5.8
+ * WC tested up to: 5.9
*
* @package WooCommerce\Blocks
* @internal This file is only used when running as a feature plugin.