diff --git a/.github/workflows/build-release-zip-file.yml b/.github/workflows/build-release-zip-file.yml
new file mode 100644
index 00000000000..2f6dd819e20
--- /dev/null
+++ b/.github/workflows/build-release-zip-file.yml
@@ -0,0 +1,30 @@
+name: Build release zip file
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'By default the zip file is generated from the branch the workflow runs from, but you can specify an explicit reference to use instead here (e.g. refs/tags/tag_name). The resulting file will be available as an artifact on the workflow run.'
+        required: false
+        default: ''
+jobs:
+  build:
+    name: Build release zip file
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
+      - name: Build the zip file
+        id: build
+        uses: woocommerce/action-build@v2
+      - name: Unzip the file (prevents double zip problem)
+        run: unzip ${{ steps.build.outputs.zip_path }} -d zipfile
+      - name: Upload the zip file as an artifact
+        uses: actions/upload-artifact@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: woocommerce
+          path: zipfile
+          retention-days: 7
diff --git a/.github/workflows/pull-request-post-merge-processing.yml b/.github/workflows/pull-request-post-merge-processing.yml
new file mode 100644
index 00000000000..1347ed5e5e1
--- /dev/null
+++ b/.github/workflows/pull-request-post-merge-processing.yml
@@ -0,0 +1,32 @@
+name: "Pull request post-merge processing"
+on: 
+  pull_request:
+    types: [closed]
+
+jobs:
+  assign-milestone:
+    name: "Assign milestone to merged pull request"
+    if: github.event.pull_request.merged == true && ! github.event.pull_request.milestone
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Get the milestone changer script"
+      run: |
+        curl \
+        --silent \
+        --fail \
+        --header 'Authorization: bearer ${{ secrets.GITHUB_TOKEN }}' \
+        --header 'User-Agent: GitHub action to set the milestone for a pull request' \
+        --header 'Accept: application/vnd.github.v3.raw' \
+        --remote-name \
+        --location $GITHUB_API_URL/repos/${{ github.repository }}/contents/.github/workflows/scripts/assign-milestone-to-merged-pr.php
+      env:
+        GITHUB_API_URL: ${{ env.GITHUB_API_URL }}
+    - name: "Install PHP"
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+    - name: "Run the milestone changer script"
+      run: php assign-milestone-to-merged-pr.php
+      env:
+        PULL_REQUEST_ID: ${{ github.event.pull_request.node_id }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/scripts/assign-milestone-to-merged-pr.php b/.github/workflows/scripts/assign-milestone-to-merged-pr.php
new file mode 100644
index 00000000000..0258813e209
--- /dev/null
+++ b/.github/workflows/scripts/assign-milestone-to-merged-pr.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Script to automatically assign a milestone to a pull request when it's merged.
+ *
+ * @package WooCommerce/GithubActions
+ */
+
+// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.AlternativeFunctions
+
+global $repo_owner, $repo_name, $github_token, $graphql_api_url;
+
+/**
+ * Grab/process input.
+ */
+
+$repo_parts = explode( '/', getenv( 'GITHUB_REPOSITORY' ) );
+$repo_owner = $repo_parts[0];
+$repo_name  = $repo_parts[1];
+
+$pr_id           = getenv( 'PULL_REQUEST_ID' );
+$github_token    = getenv( 'GITHUB_TOKEN' );
+$graphql_api_url = getenv( 'GITHUB_GRAPHQL_URL' );
+
+/**
+ * Select the milestone to be added:
+ *
+ * 1. Get the first 10 milestones sorted by creation date descending.
+ *    (we'll never have more than 2 or 3 active milestones but let's get 10 to be sure).
+ * 2. Discard those not open or whose title is not a proper version number ("X.Y.Z").
+ * 3. Sort descending using version_compare.
+ * 4. Get the oldest one that does not have a corresponding "release/X.Y" branch.
+ */
+
+echo "Getting the list of milestones...\n";
+
+$query      = "
+  repository(owner:\"$repo_owner\", name:\"$repo_name\") {
+    milestones(first: 10, states: [OPEN], orderBy: {field: CREATED_AT, direction: DESC}) {
+      nodes {
+        id
+        title
+        state
+      }
+    }
+  }
+";
+$json       = do_graphql_api_request( $query );
+$milestones = $json['data']['repository']['milestones']['nodes'];
+$milestones = array_map(
+	function( $x ) {
+		return 1 === preg_match( '/^\d+\.\d+\.\d+$/D', $x['title'] ) ? $x : null;
+	},
+	$milestones
+);
+$milestones = array_filter( $milestones );
+usort(
+	$milestones,
+	function( $a, $b ) {
+		return version_compare( $b['title'], $a['title'] );
+	}
+);
+
+echo 'Latest open milestone: ' . $milestones[0]['title'] . "\n";
+
+$chosen_milestone = null;
+foreach ( $milestones as $milestone ) {
+	$milestone_title_parts    = explode( '.', $milestone['title'] );
+	$milestone_release_branch = 'release/' . $milestone_title_parts[0] . '.' . $milestone_title_parts[1];
+
+	$query  = "
+    repository(owner:\"$repo_owner\", name:\"$repo_name\") {
+      ref(qualifiedName: \"refs/heads/$milestone_release_branch\") {
+        id
+      }
+    }
+  ";
+	$result = do_graphql_api_request( $query );
+
+	if ( is_null( $result['data']['repository']['ref'] ) ) {
+		$chosen_milestone = $milestone;
+	} else {
+		break;
+	}
+}
+
+// If all the milestones have a release branch, just take the newest one.
+if ( is_null( $chosen_milestone ) ) {
+	$chosen_milestone = $milestones[0];
+}
+
+echo 'Milestone that will be assigned: ' . $chosen_milestone['title'] . "\n";
+
+if ( getenv( 'DRY_RUN' ) ) {
+	echo "Dry run, skipping the actual milestone assignment\n";
+	return;
+}
+
+/*
+ * Assign the milestone to the pull request.
+ */
+
+echo "Assigning the milestone to the pull request...\n";
+
+$milestone_id = $chosen_milestone['id'];
+$mutation     = "
+  updatePullRequest(input: {pullRequestId: \"$pr_id\", milestoneId: \"$milestone_id\"}) {
+    clientMutationId
+  }
+";
+
+do_graphql_api_request( $mutation, true );
+
+/**
+ * Function to query the GitHub GraphQL API.
+ *
+ * @param string $body The GraphQL-formatted request body, without "query" or "mutation" wrapper.
+ * @param bool   $is_mutation True if the request is a mutation, false if it's a query.
+ * @return array The json-decoded response.
+ */
+function do_graphql_api_request( $body, $is_mutation = false ) {
+	global $github_token, $graphql_api_url;
+
+	$keyword = $is_mutation ? 'mutation' : 'query';
+	$data    = array( 'query' => "$keyword { $body }" );
+	$context = stream_context_create(
+		array(
+			'http' => array(
+				'method'  => 'POST',
+				'header'  => array(
+					'Accept: application/json',
+					'Content-Type: application/json',
+					'User-Agent: GitHub action to set the milestone for a pull request',
+					'Authorization: bearer ' . $github_token,
+				),
+				'content' => json_encode( $data ),
+			),
+		)
+	);
+
+	$result = file_get_contents( $graphql_api_url, false, $context );
+	return json_decode( $result, true );
+}
+
+// phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.AlternativeFunctions
diff --git a/.github/workflows/smoke-test-daily.yml b/.github/workflows/smoke-test-daily.yml
new file mode 100644
index 00000000000..e859ad41ed3
--- /dev/null
+++ b/.github/workflows/smoke-test-daily.yml
@@ -0,0 +1,42 @@
+name: Smoke test daily
+on:
+  schedule:
+    - cron: '25 3 * * *'
+jobs:
+  login-run:
+    name: Daily smoke test on trunk.
+    runs-on: ubuntu-18.04
+    steps:
+
+      - name: Create dirs.
+        run: |
+              mkdir -p code/woocommerce
+              mkdir -p package/woocommerce
+              mkdir -p tmp/woocommerce
+              mkdir -p node_modules
+
+      - name: Checkout code.
+        uses: actions/checkout@v2
+        with:
+          ref: trunk
+
+      - name: Install prerequisites.
+        run: |
+          npm install
+          composer install --no-dev
+          npm run build:assets
+          npm install jest
+          
+      - name: Run smoke test.
+        env:
+          SMOKE_TEST_URL: ${{ secrets.SMOKE_TEST_URL }}
+          SMOKE_TEST_ADMIN_USER: ${{ secrets.SMOKE_TEST_ADMIN_USER }}
+          SMOKE_TEST_ADMIN_PASSWORD: ${{ secrets.SMOKE_TEST_ADMIN_PASSWORD }}
+          SMOKE_TEST_CUSTOMER_USER: ${{ secrets.SMOKE_TEST_CUSTOMER_USER }}
+          SMOKE_TEST_CUSTOMER_PASSWORD: ${{ secrets.SMOKE_TEST_CUSTOMER_PASSWORD }}
+          WC_E2E_SCREENSHOTS: 1
+          E2E_RETEST: 1
+          E2E_SLACK_TOKEN: ${{ secrets.SMOKE_TEST_SLACK_TOKEN }}
+          E2E_SLACK_CHANNEL: ${{ secrets.SMOKE_TEST_SLACK_CHANNEL }}
+        run: |
+          npx wc-e2e test:e2e
diff --git a/.github/workflows/stalebot.yml b/.github/workflows/stalebot.yml
index 0c91b9a5410..23c1a0eec6e 100644
--- a/.github/workflows/stalebot.yml
+++ b/.github/workflows/stalebot.yml
@@ -1,7 +1,7 @@
 name: 'Close stale needs-feedback issues'
 on:
   schedule:
-    - cron: '0 21 * * *'
+    - cron: '21 0 * * *'
 
 jobs:
   stale:
@@ -15,6 +15,6 @@ jobs:
           days-before-issue-stale: 7
           days-before-issue-close: 7
           days-before-pr-close: -1
-          only-issue-label: 'needs feedback'
+          only-issue-labels: 'needs feedback'
           close-issue-label: "category: can't reproduce"
-          debug-only: true
+          ascending: true
diff --git a/.github/workflows/update-feedback-labels.yml b/.github/workflows/update-feedback-labels.yml
new file mode 100644
index 00000000000..bb0af46f64b
--- /dev/null
+++ b/.github/workflows/update-feedback-labels.yml
@@ -0,0 +1,27 @@
+name: 'Update contributor feedback labels on comment'
+on: 'issue_comment'
+
+jobs:
+  feedback:
+    if: |
+      github.actor != 'github-actions' &&
+      github.event.issue &&
+      github.event.issue.state == 'open' &&
+      contains(github.event.issue.labels.*.name, 'needs feedback')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Add has feedback
+      uses: actions-ecosystem/action-add-labels@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        labels: 'has feedback'
+    - name: remove needs feedback
+      uses: actions-ecosystem/action-remove-labels@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        labels: 'needs feedback'
+    - name: remove stale
+      uses: actions-ecosystem/action-remove-labels@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        labels: Stale
diff --git a/.gitignore b/.gitignore
index d5584c21452..106818c04f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ project.properties
 .settings*
 .idea
 .vscode
+.eslintcache
 *.sublime-project
 *.sublime-workspace
 .sublimelinterrc
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index 3dca45bdf8c..6ea357b8e2a 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -161,6 +161,43 @@
 		}
 	}
 
+	.addons-promotion-block {
+		display: flex;
+		padding: 20px;
+
+		.addons-img {
+			height: auto;
+			width: 200px;
+		}
+	}
+
+	.addons-promotion-block-content {
+		display: flex;
+		flex-direction: column;
+		margin-left: 24px;
+	}
+
+	.addons-promotion-block-description {
+		margin-bottom: 20px;
+	}
+
+	.addons-promotion-block-title {
+		margin: 0 0 16px;
+		padding: 0;
+	}
+
+	.addons-promotion-block-buttons {
+		margin-top: auto;
+
+		.addons-button {
+			margin-right: 8px;
+
+			&:last-child {
+				margin-right: 0;
+			}
+		}
+	}
+
 	.addons-shipping-methods .addons-wcs-banner-block {
 		margin-left: 0;
 		margin-right: 0;
@@ -364,6 +401,12 @@
 		color: #fff;
 	}
 
+	.addons-button-expandable {
+		display: inline-block;
+		padding: 0 16px;
+		width: auto;
+	}
+
 	.addons-button-solid:hover {
 		color: #fff;
 		opacity: 0.8;
@@ -2642,6 +2685,30 @@ ul.wc_coupon_list_block {
 			float: right;
 		}
 	}
+
+	.wc_addons_wrap {
+
+		.addons-promotion-block {
+			flex-direction: column;
+			padding: 24px;
+
+			.addons-img {
+				height: auto;
+				width: 100%;
+				max-width: 240px;
+				margin: 0 auto 20px;
+			}
+		}
+
+		.addons-promotion-block-content {
+			display: block;
+			margin-left: 0;
+		}
+
+		.addons-promotion-block-title {
+			margin-top: 4px;
+		}
+	}
 }
 
 .column-customer_message .note-on {
diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index f51a2cf7e0d..5c22ef3640e 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -53,7 +53,7 @@
 				.on( 'click', css_class, function( evt ) {
 					evt.preventDefault();
 					if ( ! document.queryCommandSupported( 'copy' ) ) {
-						$( css_class ).parent().find( 'input' ).focus().select();
+						$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
 						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 					} else {
 						$( '#copy-error' ).text( '' );
@@ -69,10 +69,10 @@
 						'fadeIn':     50,
 						'fadeOut':    50,
 						'delay':      0
-					} ).focus();
+					} ).trigger( 'focus' );
 				} )
 				.on( 'aftercopyerror', css_class, function() {
-					$( css_class ).parent().find( 'input' ).focus().select();
+					$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
 					$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 				} );
 		},
diff --git a/assets/js/admin/backbone-modal.js b/assets/js/admin/backbone-modal.js
index 63cca56422a..061a37c8bae 100644
--- a/assets/js/admin/backbone-modal.js
+++ b/assets/js/admin/backbone-modal.js
@@ -72,7 +72,7 @@
 			_.bindAll( this, 'render' );
 			this.render();
 
-			$( window ).resize(function() {
+			$( window ).on( 'resize', function() {
 				view.resizeContent();
 			});
 		},
@@ -88,7 +88,7 @@
 			}).append( this.$el );
 
 			this.resizeContent();
-			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).focus();
+			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).trigger( 'focus' );
 
 			$( document.body ).trigger( 'init_tooltips' );
 
diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js
index c4327f33644..594726739c0 100644
--- a/assets/js/admin/meta-boxes-coupon.js
+++ b/assets/js/admin/meta-boxes-coupon.js
@@ -61,7 +61,7 @@ jQuery(function( $ ) {
 				);
 			}
 			$result = woocommerce_admin_meta_boxes_coupon.prefix + $result + woocommerce_admin_meta_boxes_coupon.suffix;
-			$coupon_code_field.focus().val( $result );
+			$coupon_code_field.trigger( 'focus' ).val( $result );
 			$coupon_code_label.addClass( 'screen-reader-text' );
 		}
 	};
diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index 2267afe26ed..f108dff0ec6 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -22,7 +22,7 @@ jQuery( function ( $ ) {
 				this.states = JSON.parse( woocommerce_admin_meta_boxes_order.countries.replace( /&quot;/g, '"' ) );
 			}
 
-			$( '.js_field-country' ).selectWoo().change( this.change_country );
+			$( '.js_field-country' ).selectWoo().on( 'change', this.change_country );
 			$( '.js_field-country' ).trigger( 'change', [ true ] );
 			$( document.body ).on( 'change', 'select.js_field-state', this.change_state );
 			$( '#woocommerce-order-actions input, #woocommerce-order-actions a' ).on( 'click', function() {
@@ -140,7 +140,7 @@ jQuery( function ( $ ) {
 				is_billing     = Boolean( $edit_address.find( 'input[name^="_billing_"]' ).length );
 
 			$address.hide();
-			$this.parent().find( 'a' ).toggle();
+			$this.parent().find( 'a' ).trigger( 'toggle' );
 
 			if ( ! $country_input.val() ) {
 				$country_input.val( woocommerce_admin_meta_boxes_order.default_country ).trigger( 'change' );
@@ -1470,7 +1470,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		},
 
 		/**
@@ -1483,7 +1483,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		}
 	};
 
diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index 551ad33a114..fbb9701f04d 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -594,7 +594,7 @@ jQuery( function( $ ) {
 
 				$( '.woocommerce-notice-invalid-variation' ).remove();
 				$( '#variable_product_options' ).find( '.woocommerce_variations' ).prepend( variation );
-				$( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' );
+				$( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false );
 				$( '#variable_product_options' ).trigger( 'woocommerce_variations_added', 1 );
 				wc_meta_boxes_product_variations_ajax.unblock();
 			});
@@ -700,7 +700,7 @@ jQuery( function( $ ) {
 				.closest( '.woocommerce_variation' )
 				.addClass( 'variation-needs-update' );
 
-			$( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' );
+			$( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false );
 
 			$( '#variable_product_options' ).trigger( 'woocommerce_variations_input_changed' );
 		},
@@ -714,7 +714,7 @@ jQuery( function( $ ) {
 				.find( '.woocommerce_variation:first' )
 				.addClass( 'variation-needs-update' );
 
-			$( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' );
+			$( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false );
 
 			$( '#variable_product_options' ).trigger( 'woocommerce_variations_defaults_changed' );
 		},
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index 6d00cbc7a7b..e9cad28e4c6 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -34,17 +34,23 @@ jQuery( function( $ ) {
 	}
 
 	$( function() {
-		// Prevent inputs in meta box headings opening/closing contents.
-		$( '#woocommerce-product-data' ).find( '.hndle' ).unbind( 'click.postboxes' );
+		var woocommerce_product_data = $( '#woocommerce-product-data' );
 
-		$( '#woocommerce-product-data' ).on( 'click', '.hndle', function( event ) {
+		// Prevent inputs in meta box headings opening/closing contents.
+		woocommerce_product_data.find( '.hndle' ).off( 'click.postboxes' );
+
+		woocommerce_product_data.on( 'click', '.hndle', function( event ) {
 
 			// If the user clicks on some form input inside the h3 the box should not be toggled.
 			if ( $( event.target ).filter( 'input, option, label, select' ).length ) {
 				return;
 			}
 
-			$( '#woocommerce-product-data' ).toggleClass( 'closed' );
+			if ( woocommerce_product_data.hasClass( 'closed' ) ) {
+				woocommerce_product_data.removeClass( 'closed' );
+			} else {
+				woocommerce_product_data.addClass( 'closed' );
+			}
 		});
 	});
 
@@ -77,7 +83,7 @@ jQuery( function( $ ) {
 		var current_visibility = $( '#current_visibility' ).val();
 		var current_featured   = $( '#current_featured' ).val();
 
-		$( 'input[name=_visibility]' ).removeAttr( 'checked' );
+		$( 'input[name=_visibility]' ).prop( 'checked', false );
 		$( 'input[name=_visibility][value=' + current_visibility + ']' ).attr( 'checked', 'checked' );
 
 		var label = $( 'input[name=_visibility]:checked' ).attr( 'data-label' );
@@ -86,7 +92,7 @@ jQuery( function( $ ) {
 			label = label + ', ' + woocommerce_admin_meta_boxes.featured_label;
 			$( 'input[name=_featured]' ).attr( 'checked', 'checked' );
 		} else {
-			$( 'input[name=_featured]' ).removeAttr( 'checked' );
+			$( 'input[name=_featured]' ).prop( 'checked', false );
 		}
 
 		$( '#catalog-visibility-display' ).text( label );
@@ -94,7 +100,7 @@ jQuery( function( $ ) {
 	});
 
 	// Product type specific options.
-	$( 'select#product-type' ).change( function() {
+	$( 'select#product-type' ).on( 'change', function() {
 
 		// Get value.
 		var select_val = $( this ).val();
@@ -102,13 +108,13 @@ jQuery( function( $ ) {
 		if ( 'variable' === select_val ) {
 			$( 'input#_manage_stock' ).trigger( 'change' );
 			$( 'input#_downloadable' ).prop( 'checked', false );
-			$( 'input#_virtual' ).removeAttr( 'checked' );
+			$( 'input#_virtual' ).prop( 'checked', false );
 		} else if ( 'grouped' === select_val ) {
 			$( 'input#_downloadable' ).prop( 'checked', false );
-			$( 'input#_virtual' ).removeAttr( 'checked' );
+			$( 'input#_virtual' ).prop( 'checked', false );
 		} else if ( 'external' === select_val ) {
 			$( 'input#_downloadable' ).prop( 'checked', false );
-			$( 'input#_virtual' ).removeAttr( 'checked' );
+			$( 'input#_virtual' ).prop( 'checked', false );
 		}
 
 		show_and_hide_panels();
@@ -119,7 +125,7 @@ jQuery( function( $ ) {
 
 	}).trigger( 'change' );
 
-	$( 'input#_downloadable, input#_virtual' ).change( function() {
+	$( 'input#_downloadable, input#_virtual' ).on( 'change', function() {
 		show_and_hide_panels();
 	});
 
@@ -239,7 +245,7 @@ jQuery( function( $ ) {
 	});
 
 	// Stock options.
-	$( 'input#_manage_stock' ).change( function() {
+	$( 'input#_manage_stock' ).on( 'change', function() {
 		if ( $( this ).is( ':checked' ) ) {
 			$( 'div.stock_fields' ).show();
 			$( 'p.stock_status_field' ).hide();
@@ -361,7 +367,7 @@ jQuery( function( $ ) {
 	});
 
 	$( '.product_attributes' ).on( 'click', 'button.select_no_attributes', function() {
-		$( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
+		$( this ).closest( 'td' ).find( 'select option' ).prop( 'selected', false );
 		$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 		return false;
 	});
@@ -373,7 +379,7 @@ jQuery( function( $ ) {
 			if ( $parent.is( '.taxonomy' ) ) {
 				$parent.find( 'select, input[type=text]' ).val( '' );
 				$parent.hide();
-				$( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' ).removeAttr( 'disabled' );
+				$( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' ).prop( 'disabled', false );
 			} else {
 				$parent.find( 'select, input[type=text]' ).val( '' );
 				$parent.hide();
diff --git a/assets/js/admin/meta-boxes.js b/assets/js/admin/meta-boxes.js
index 1f82968994f..a815b38315c 100644
--- a/assets/js/admin/meta-boxes.js
+++ b/assets/js/admin/meta-boxes.js
@@ -17,7 +17,19 @@ jQuery( function ( $ ) {
 	runTipTip();
 
 	$( '.wc-metaboxes-wrapper' ).on( 'click', '.wc-metabox > h3', function() {
-		$( this ).parent( '.wc-metabox' ).toggleClass( 'closed' ).toggleClass( 'open' );
+		var metabox = $( this ).parent( '.wc-metabox' );
+
+		if ( metabox.hasClass( 'closed' ) ) {
+			metabox.removeClass( 'closed' );
+		} else {
+			metabox.addClass( 'closed' );
+		}
+
+		if ( metabox.hasClass( 'open' ) ) {
+			metabox.removeClass( 'open' );
+		} else {
+			metabox.addClass( 'open' );
+		}
 	});
 
 	// Tabbed Panels
diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js
index 8c64a049f33..c15b76f580d 100644
--- a/assets/js/admin/quick-edit.js
+++ b/assets/js/admin/quick-edit.js
@@ -57,7 +57,7 @@ jQuery(
 					'select[name="_visibility"] option, ' +
 					'select[name="_stock_status"] option, ' +
 					'select[name="_backorders"] option'
-				).removeAttr( 'selected' );
+				).prop( 'selected', false );
 
 				var is_variable_product = 'variable' === product_type;
 				$( 'select[name="_stock_status"] ~ .wc-quick-edit-warning', '.inline-edit-row' ).toggle( is_variable_product );
@@ -72,7 +72,7 @@ jQuery(
 				if ( 'yes' === featured ) {
 					$( 'input[name="_featured"]', '.inline-edit-row' ).attr( 'checked', 'checked' );
 				} else {
-					$( 'input[name="_featured"]', '.inline-edit-row' ).removeAttr( 'checked' );
+					$( 'input[name="_featured"]', '.inline-edit-row' ).prop( 'checked', false );
 				}
 
 				// Conditional display.
diff --git a/assets/js/admin/settings-views-html-settings-tax.js b/assets/js/admin/settings-views-html-settings-tax.js
index 061c2bd1af7..f7c79fe01c1 100644
--- a/assets/js/admin/settings-views-html-settings-tax.js
+++ b/assets/js/admin/settings-views-html-settings-tax.js
@@ -167,7 +167,7 @@
 
 					// Postcode and city don't have `name` values by default.
 					// They're only created if the contents changes, to save on database queries (I think)
-					this.$el.find( 'td.postcode input, td.city input' ).change( function() {
+					this.$el.find( 'td.postcode input, td.city input' ).on( 'change', function() {
 						$( this ).attr( 'name', $( this ).data( 'name' ) );
 					});
 
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index de5931fd25d..72306309d24 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -2,7 +2,7 @@
 ( function( $, params, wp ) {
 	$( function() {
 		// Sell Countries
-		$( 'select#woocommerce_allowed_countries' ).change( function() {
+		$( 'select#woocommerce_allowed_countries' ).on( 'change', function() {
 			if ( 'specific' === $( this ).val() ) {
 				$( this ).closest('tr').next( 'tr' ).hide();
 				$( this ).closest('tr').next().next( 'tr' ).show();
@@ -16,7 +16,7 @@
 		}).trigger( 'change' );
 
 		// Ship Countries
-		$( 'select#woocommerce_ship_to_countries' ).change( function() {
+		$( 'select#woocommerce_ship_to_countries' ).on( 'change', function() {
 			if ( 'specific' === $( this ).val() ) {
 				$( this ).closest('tr').next( 'tr' ).show();
 			} else {
@@ -25,7 +25,7 @@
 		}).trigger( 'change' );
 
 		// Stock management
-		$( 'input#woocommerce_manage_stock' ).change( function() {
+		$( 'input#woocommerce_manage_stock' ).on( 'change', function() {
 			if ( $( this ).is(':checked') ) {
 				$( this ).closest('tbody').find( '.manage_stock_field' ).closest( 'tr' ).show();
 			} else {
@@ -48,15 +48,15 @@
 				event.stopPropagation();
 				$( '.iris-picker' ).hide();
 				$( this ).closest( 'td' ).find( '.iris-picker' ).show();
-				$( this ).data( 'original-value', $( this ).val() );
+				$( this ).data( 'originalValue', $( this ).val() );
 			})
 
 			.on( 'change', function() {
 				if ( $( this ).is( '.iris-error' ) ) {
-					var original_value = $( this ).data( 'original-value' );
+					var original_value = $( this ).data( 'originalValue' );
 
 					if ( original_value.match( /^\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/ ) ) {
-						$( this ).val( $( this ).data( 'original-value' ) ).trigger( 'change' );
+						$( this ).val( $( this ).data( 'originalValue' ) ).trigger( 'change' );
 					} else {
 						$( this ).val( '' ).trigger( 'change' );
 					}
@@ -71,7 +71,7 @@
 		$( function() {
 			var changed = false;
 
-			$( 'input, textarea, select, checkbox' ).change( function() {
+			$( 'input, textarea, select, checkbox' ).on( 'change', function() {
 				if ( ! changed ) {
 					window.onbeforeunload = function() {
 						return params.i18n_nav_warning;
@@ -116,7 +116,7 @@
 		});
 
 		$( '.woocommerce' ).on( 'click', '.select_none', function() {
-			$( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
+			$( this ).closest( 'td' ).find( 'select option' ).prop( 'selected', false );
 			$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 			return false;
 		});
@@ -126,7 +126,7 @@
 			var moveBtn = $( this ),
 				$row    = moveBtn.closest( 'tr' );
 
-			moveBtn.focus();
+			moveBtn.trigger( 'focus' );
 
 			var isMoveUp = moveBtn.is( '.wc-move-up' ),
 				isMoveDown = moveBtn.is( '.wc-move-down' );
@@ -147,7 +147,7 @@
 				}
 			}
 
-			moveBtn.focus(); // Re-focus after the container was moved.
+			moveBtn.trigger( 'focus' ); // Re-focus after the container was moved.
 			moveBtn.closest( 'table' ).trigger( 'updateMoveButtons' );
 		} );
 
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index cb84c875444..a2457530a5a 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -33,11 +33,11 @@ jQuery( function ( $ ) {
 
 			$( '.wc_status_table thead, .wc_status_table tbody' ).each( function() {
 				if ( $( this ).is( 'thead' ) ) {
-					var label = $( this ).find( 'th:eq(0)' ).data( 'export-label' ) || $( this ).text();
+					var label = $( this ).find( 'th:eq(0)' ).data( 'exportLabel' ) || $( this ).text();
 					report = report + '\n### ' + label.trim() + ' ###\n\n';
 				} else {
 					$( 'tr', $( this ) ).each( function() {
-						var label       = $( this ).find( 'td:eq(0)' ).data( 'export-label' ) || $( this ).find( 'td:eq(0)' ).text();
+						var label       = $( this ).find( 'td:eq(0)' ).data( 'exportLabel' ) || $( this ).find( 'td:eq(0)' ).text();
 						var the_name    = label.trim().replace( /(<([^>]+)>)/ig, '' ); // Remove HTML.
 
 						// Find value
@@ -68,7 +68,7 @@ jQuery( function ( $ ) {
 
 			try {
 				$( '#debug-report' ).slideDown();
-				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().select();
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).trigger( 'select' );
 				$( this ).fadeOut();
 				return false;
 			} catch ( e ) {
@@ -100,7 +100,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		},
 
 		/**
@@ -108,7 +108,7 @@ jQuery( function ( $ ) {
 		 */
 		copyFail: function() {
 			$( '.copy-error' ).removeClass( 'hidden' );
-			$( '#debug-report' ).find( 'textarea' ).focus().select();
+			$( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).trigger( 'select' );
 		}
 	};
 
diff --git a/assets/js/admin/users.js b/assets/js/admin/users.js
index cb2b816604e..2d6c1fa7138 100644
--- a/assets/js/admin/users.js
+++ b/assets/js/admin/users.js
@@ -12,7 +12,7 @@ jQuery( function ( $ ) {
 				this.states = JSON.parse( wc_users_params.countries.replace( /&quot;/g, '"' ) );
 			}
 
-			$( '.js_field-country' ).selectWoo().change( this.change_country );
+			$( '.js_field-country' ).selectWoo().on( 'change', this.change_country );
 			$( '.js_field-country' ).trigger( 'change', [ true ] );
 			$( document.body ).on( 'change', 'select.js_field-state', this.change_state );
 
diff --git a/assets/js/admin/wc-clipboard.js b/assets/js/admin/wc-clipboard.js
index fc009d02041..8a2391213ae 100644
--- a/assets/js/admin/wc-clipboard.js
+++ b/assets/js/admin/wc-clipboard.js
@@ -17,7 +17,7 @@ function wcSetClipboard( data, $el ) {
 	}
 	var $temp_input = jQuery( '<textarea style="opacity:0">' );
 	jQuery( 'body' ).append( $temp_input );
-	$temp_input.val( data ).select();
+	$temp_input.val( data ).trigger( 'select' );
 
 	$el.trigger( 'beforecopy' );
 	try {
diff --git a/assets/js/admin/wc-orders.js b/assets/js/admin/wc-orders.js
index 018e6a23aa3..4fafc95ff81 100644
--- a/assets/js/admin/wc-orders.js
+++ b/assets/js/admin/wc-orders.js
@@ -45,12 +45,12 @@ jQuery( function( $ ) {
 	 */
 	WCOrdersTable.prototype.onPreview = function() {
 		var $previewButton    = $( this ),
-			$order_id         = $previewButton.data( 'order-id' );
+			$order_id         = $previewButton.data( 'orderId' );
 
 		if ( $previewButton.data( 'order-data' ) ) {
 			$( this ).WCBackboneModal({
 				template: 'wc-modal-view-order',
-				variable : $previewButton.data( 'order-data' )
+				variable : $previewButton.data( 'orderData' )
 			});
 		} else {
 			$previewButton.addClass( 'disabled' );
@@ -67,7 +67,7 @@ jQuery( function( $ ) {
 					$( '.order-preview' ).removeClass( 'disabled' );
 
 					if ( response.success ) {
-						$previewButton.data( 'order-data', response.data );
+						$previewButton.data( 'orderData', response.data );
 
 						$( this ).WCBackboneModal({
 							template: 'wc-modal-view-order',
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index 315ef4218a1..fb24eba10b7 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -37,7 +37,7 @@ jQuery( function( $ ) {
 		} );
 
 		$( document.body ).on( 'wc_backbone_modal_response', function() {
-			form.unbind( 'submit' ).trigger( 'submit' );
+			form.off( 'submit' ).trigger( 'submit' );
 		} );
 
 		$( '#wc_tracker_checkbox_dialog' ).on( 'change', function( e ) {
@@ -46,7 +46,7 @@ jQuery( function( $ ) {
 		} );
 
 		$( '#wc_tracker_submit' ).on( 'click', function () {
-			form.unbind( 'submit' ).trigger( 'submit' );
+			form.off( 'submit' ).trigger( 'submit' );
 		} );
 
 		return true;
@@ -96,7 +96,7 @@ jQuery( function( $ ) {
 		if ( $.isEmptyObject( country_postcode_obj ) || country_postcode_obj.required  ) {
 			$store_postcode_input.attr( 'required', 'true' );
 		} else {
-			$store_postcode_input.removeAttr( 'required' );
+			$store_postcode_input.prop( 'required', false );
 		}
 	} );
 
@@ -139,7 +139,14 @@ jQuery( function( $ ) {
 	} );
 
 	$( '.wc-wizard-services-list-toggle' ).on( 'click', function() {
-		$( this ).closest( '.wc-wizard-services-list-toggle' ).toggleClass( 'closed' );
+		var listToggle = $( this ).closest( '.wc-wizard-services-list-toggle' );
+
+		if ( listToggle.hasClass( 'closed' ) ) {
+			listToggle.removeClass( 'closed' );
+		} else {
+			listToggle.addClass( 'closed' );
+		}
+
 		$( this ).closest( '.wc-wizard-services' ).find( '.wc-wizard-service-item' )
 			.slideToggle()
 			.css( 'display', 'flex' );
diff --git a/assets/js/admin/wc-shipping-classes.js b/assets/js/admin/wc-shipping-classes.js
index 526076c431f..8a87bb42a9b 100644
--- a/assets/js/admin/wc-shipping-classes.js
+++ b/assets/js/admin/wc-shipping-classes.js
@@ -202,7 +202,7 @@
 				},
 				setUnloadConfirmation: function() {
 					this.needsUnloadConfirm = true;
-					$save_button.removeAttr( 'disabled' );
+					$save_button.prop( 'disabled', false );
 				},
 				clearUnloadConfirmation: function() {
 					this.needsUnloadConfirm = false;
diff --git a/assets/js/admin/wc-shipping-zone-methods.js b/assets/js/admin/wc-shipping-zone-methods.js
index 45d17f19d21..ec7f3ba13ee 100644
--- a/assets/js/admin/wc-shipping-zone-methods.js
+++ b/assets/js/admin/wc-shipping-zone-methods.js
@@ -221,7 +221,7 @@
 				},
 				setUnloadConfirmation: function() {
 					this.needsUnloadConfirm = true;
-					$save_button.removeAttr( 'disabled' );
+					$save_button.prop( 'disabled', false );
 				},
 				clearUnloadConfirmation: function() {
 					this.needsUnloadConfirm = false;
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index 3c7903b78d2..7c53679c3af 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -232,7 +232,7 @@
 		});
 		// Focus on inputs within the table if clicked instead of trying to sort.
 		$( '.wc_input_table.sortable tbody input' ).on( 'click', function() {
-			$( this ).focus();
+			$( this ).trigger( 'focus' );
 		} );
 
 		$( '.wc_input_table .remove_rows' ).on( 'click', function() {
@@ -309,7 +309,7 @@
 		});
 
 		// Select availability
-		$( 'select.availability' ).change( function() {
+		$( 'select.availability' ).on( 'change', function() {
 			if ( $( this ).val() === 'all' ) {
 				$( this ).closest( 'tr' ).next( 'tr' ).hide();
 			} else {
@@ -319,7 +319,7 @@
 
 		// Hidden options
 		$( '.hide_options_if_checked' ).each( function() {
-			$( this ).find( 'input:eq(0)' ).change( function() {
+			$( this ).find( 'input:eq(0)' ).on( 'change', function() {
 				if ( $( this ).is( ':checked' ) ) {
 					$( this )
 						.closest( 'fieldset, tr' )
@@ -335,7 +335,7 @@
 		});
 
 		$( '.show_options_if_checked' ).each( function() {
-			$( this ).find( 'input:eq(0)' ).change( function() {
+			$( this ).find( 'input:eq(0)' ).on( 'change', function() {
 				if ( $( this ).is( ':checked' ) ) {
 					$( this )
 						.closest( 'fieldset, tr' )
@@ -351,7 +351,7 @@
 		});
 
 		// Reviews.
-		$( 'input#woocommerce_enable_reviews' ).change(function() {
+		$( 'input#woocommerce_enable_reviews' ).on( 'change', function() {
 			if ( $( this ).is( ':checked' ) ) {
 				$( '#woocommerce_enable_review_rating' ).closest( 'tr' ).show();
 			} else {
diff --git a/assets/js/flexslider/jquery.flexslider.js b/assets/js/flexslider/jquery.flexslider.js
index d0068f8967f..dbf32efb237 100755
--- a/assets/js/flexslider/jquery.flexslider.js
+++ b/assets/js/flexslider/jquery.flexslider.js
@@ -104,7 +104,7 @@
 
         // KEYBOARD:
         if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) {
-          $(document).bind('keyup', function(event) {
+          $(document).on('keyup', function(event) {
             var keycode = event.keyCode;
             if (!slider.animating && (keycode === 39 || keycode === 37)) {
               var target = (slider.vars.rtl?
@@ -121,7 +121,7 @@
         }
         // MOUSEWHEEL:
         if (slider.vars.mousewheel) {
-          slider.bind('mousewheel', function(event, delta, deltaX, deltaY) {
+          slider.on('mousewheel', function(event, delta, deltaX, deltaY) {
             event.preventDefault();
             var target = (delta < 0) ? slider.getTarget('next') : slider.getTarget('prev');
             slider.flexAnimate(target, slider.vars.pauseOnAction);
@@ -137,9 +137,9 @@
         // SLIDSESHOW
         if (slider.vars.slideshow) {
           if (slider.vars.pauseOnHover) {
-            slider.hover(function() {
+            slider.on( 'mouseenter', function() {
               if (!slider.manualPlay && !slider.manualPause) { slider.pause(); }
-            }, function() {
+            } ).on( 'mouseleave', function() {
               if (!slider.manualPause && !slider.manualPlay && !slider.stopped) { slider.play(); }
             });
           }
@@ -157,7 +157,7 @@
         if (touch && slider.vars.touch) { methods.touch(); }
 
         // FADE&&SMOOTHHEIGHT || SLIDE:
-        if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize); }
+        if (!fade || (fade && slider.vars.smoothHeight)) { $(window).on("resize orientationchange focus", methods.resize); }
 
         slider.find("img").attr("draggable", "false");
 
@@ -237,27 +237,27 @@
             for (var i = 0; i < slider.pagingCount; i++) {
               slide = slider.slides.eq(i);
 
-              if ( undefined === slide.attr( 'data-thumb-alt' ) ) { 
-                slide.attr( 'data-thumb-alt', '' ); 
+              if ( undefined === slide.attr( 'data-thumb-alt' ) ) {
+                slide.attr( 'data-thumb-alt', '' );
               }
-              
+
               item = $( '<a></a>' ).attr( 'href', '#' ).text( j );
               if ( slider.vars.controlNav === "thumbnails" ) {
                 item = $( '<img/>' ).attr( 'src', slide.attr( 'data-thumb' ) );
               }
-              
+
               if ( '' !== slide.attr( 'data-thumb-alt' ) ) {
                 item.attr( 'alt', slide.attr( 'data-thumb-alt' ) );
               }
 
               if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
                 var captn = slide.attr( 'data-thumbcaption' );
-                if ( '' !== captn && undefined !== captn ) { 
+                if ( '' !== captn && undefined !== captn ) {
                   var caption = $('<span></span>' ).addClass( namespace + 'caption' ).text( captn );
                   item.append( caption );
                 }
               }
-              
+
               var liElement = $( '<li>' );
               item.appendTo( liElement );
               liElement.append( '</li>' );
@@ -274,7 +274,7 @@
 
           methods.controlNav.active();
 
-          slider.controlNavScaffold.delegate('a, img', eventType, function(event) {
+          slider.controlNavScaffold.on(eventType, 'a, img', function(event) {
             event.preventDefault();
 
             if (watchedEvent === "" || watchedEvent === event.type) {
@@ -299,7 +299,7 @@
           slider.controlNav = slider.manualControls;
           methods.controlNav.active();
 
-          slider.controlNav.bind(eventType, function(event) {
+          slider.controlNav.on(eventType, function(event) {
             event.preventDefault();
 
             if (watchedEvent === "" || watchedEvent === event.type) {
@@ -356,7 +356,7 @@
 
           methods.directionNav.update();
 
-          slider.directionNav.bind(eventType, function(event) {
+          slider.directionNav.on(eventType, function(event) {
             event.preventDefault();
             var target;
 
@@ -372,7 +372,7 @@
             methods.setToClearWatchedEvent();
           });
         },
-        update: function() {
+        update: function() {console.log('updating...');
           var disabledClass = namespace + 'disabled';
           if (slider.pagingCount === 1) {
             slider.directionNav.addClass(disabledClass).attr('tabindex', '-1');
@@ -382,10 +382,10 @@
             } else if (slider.animatingTo === slider.last) {
               slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "next").addClass(disabledClass).attr('tabindex', '-1');
             } else {
-              slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
+              slider.directionNav.removeClass(disabledClass).prop( 'tabindex', '-1' );
             }
           } else {
-            slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
+            slider.directionNav.removeClass(disabledClass).prop( 'tabindex', '-1' );
           }
         }
       },
@@ -404,7 +404,7 @@
 
           methods.pausePlay.update((slider.vars.slideshow) ? namespace + 'pause' : namespace + 'play');
 
-          slider.pausePlay.bind(eventType, function(event) {
+          slider.pausePlay.on(eventType, function(event) {
             event.preventDefault();
 
             if (watchedEvent === "" || watchedEvent === event.type) {
@@ -794,8 +794,8 @@
             }
 
             // Unbind previous transitionEnd events and re-bind new transitionEnd event
-            slider.container.unbind("webkitTransitionEnd transitionend");
-            slider.container.bind("webkitTransitionEnd transitionend", function() {
+            slider.container.off("webkitTransitionEnd transitionend");
+            slider.container.on("webkitTransitionEnd transitionend", function() {
               clearTimeout(slider.ensureAnimationEnd);
               slider.wrapup(dimension);
             });
@@ -1133,9 +1133,9 @@
   };
 
   // Ensure the slider isn't focussed if the window loses focus.
-  $( window ).blur( function ( e ) {
+  $( window ).on( 'blur', function ( e ) {
     focused = false;
-  }).focus( function ( e ) {
+  }).on( 'focus', function ( e ) {
     focused = true;
   });
 
diff --git a/assets/js/frontend/add-payment-method.js b/assets/js/frontend/add-payment-method.js
index d824ce86a39..b200c6921fe 100644
--- a/assets/js/frontend/add-payment-method.js
+++ b/assets/js/frontend/add-payment-method.js
@@ -26,7 +26,7 @@ jQuery( function( $ ) {
 	// Trigger initial click
 	.find( 'input[name=payment_method]:checked' ).trigger( 'click' );
 
-	$( '#add_payment_method' ).submit( function() {
+	$( '#add_payment_method' ).on( 'submit', function() {
 		$( '#add_payment_method' ).block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
 	});
 
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index eb833d13b6c..eb28659f96e 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -379,7 +379,7 @@
 			if ( ! current_attr_select.data( 'attribute_html' ) ) {
 				var refSelect = current_attr_select.clone();
 
-				refSelect.find( 'option' ).prop( 'disabled attached', false ).prop( 'selected', false );
+				refSelect.find( 'option' ).removeAttr( 'attached' ).prop( 'disabled', false ).prop( 'selected', false );
 
 				// Legacy data attribute.
 				current_attr_select.data(
diff --git a/assets/js/frontend/cart-fragments.js b/assets/js/frontend/cart-fragments.js
index c5eef7b4c72..e70ad4ad36c 100644
--- a/assets/js/frontend/cart-fragments.js
+++ b/assets/js/frontend/cart-fragments.js
@@ -180,7 +180,7 @@ jQuery( function( $ ) {
 		wp.customize.widgetsPreview.WidgetPartial
 	);
 	if ( hasSelectiveRefresh ) {
-		wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
+		wp.customize.selectiveRefresh.on( 'partial-content-rendered', function() {
 			refresh_cart_fragment();
 		} );
 	}
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index c7e5960df7f..06d2ad9684e 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -58,7 +58,7 @@ jQuery( function( $ ) {
 				$( document.body ).trigger( 'init_checkout' );
 			}
 			if ( wc_checkout_params.option_guest_checkout === 'yes' ) {
-				$( 'input#createaccount' ).change( this.toggle_create_account ).trigger( 'change' );
+				$( 'input#createaccount' ).on( 'change', this.toggle_create_account ).trigger( 'change' );
 			}
 		},
 		init_payment_methods: function() {
@@ -449,12 +449,12 @@ jQuery( function( $ ) {
 			$( window ).on('beforeunload', this.handleUnloadEvent);
 		},
 		detachUnloadEventsOnSubmit: function() {
-			$( window ).unbind('beforeunload', this.handleUnloadEvent);
+			$( window ).off('beforeunload', this.handleUnloadEvent);
 		},
 		blockOnSubmit: function( $form ) {
-			var form_data = $form.data();
+			var isBlocked = $form.data( 'blockUI.isBlocked' );
 
-			if ( 1 !== form_data['blockUI.isBlocked'] ) {
+			if ( 1 !== isBlocked ) {
 				$form.block({
 					message: null,
 					overlayCSS: {
@@ -589,11 +589,11 @@ jQuery( function( $ ) {
 		init: function() {
 			$( document.body ).on( 'click', 'a.showcoupon', this.show_coupon_form );
 			$( document.body ).on( 'click', '.woocommerce-remove-coupon', this.remove_coupon );
-			$( 'form.checkout_coupon' ).hide().submit( this.submit );
+			$( 'form.checkout_coupon' ).hide().on( 'submit', this.submit );
 		},
 		show_coupon_form: function() {
 			$( '.checkout_coupon' ).slideToggle( 400, function() {
-				$( '.checkout_coupon' ).find( ':input:eq(0)' ).focus();
+				$( '.checkout_coupon' ).find( ':input:eq(0)' ).trigger( 'focus' );
 			});
 			return false;
 		},
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 0c003dd9e41..46a0467ff01 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -55,14 +55,17 @@ jQuery( function( $ ) {
 
 		var wc_country_select_select2 = function() {
 			$( 'select.country_select:visible, select.state_select:visible' ).each( function() {
+				var $this = $( this );
+
 				var select2_args = $.extend({
-					placeholder: $( this ).attr( 'data-placeholder' ) || $( this ).attr( 'placeholder' ) || '',
+					placeholder: $this.attr( 'data-placeholder' ) || $this.attr( 'placeholder' ) || '',
+					label: $this.attr( 'data-label' ) || null,
 					width: '100%'
 				}, getEnhancedSelectFormatString() );
 
 				$( this )
 					.on( 'select2:select', function() {
-						$( this ).focus(); // Maintain focus after select https://github.com/select2/select2/issues/4384
+						$( this ).trigger( 'focus' ); // Maintain focus after select https://github.com/select2/select2/issues/4384
 					} )
 					.selectWoo( select2_args );
 			});
diff --git a/assets/js/frontend/password-strength-meter.js b/assets/js/frontend/password-strength-meter.js
index 835a1a74c67..6cb9a999c5c 100644
--- a/assets/js/frontend/password-strength-meter.js
+++ b/assets/js/frontend/password-strength-meter.js
@@ -48,7 +48,7 @@
 			) {
 				submit.attr( 'disabled', 'disabled' ).addClass( 'disabled' );
 			} else {
-				submit.removeAttr( 'disabled', 'disabled' ).removeClass( 'disabled' );
+				submit.prop( 'disabled', false ).removeClass( 'disabled' );
 			}
 		},
 
diff --git a/assets/js/frontend/price-slider.js b/assets/js/frontend/price-slider.js
index 2097dbae270..1c456527d96 100644
--- a/assets/js/frontend/price-slider.js
+++ b/assets/js/frontend/price-slider.js
@@ -76,7 +76,7 @@ jQuery( function( $ ) {
 		wp.customize.widgetsPreview.WidgetPartial
 	);
 	if ( hasSelectiveRefresh ) {
-		wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
+		wp.customize.selectiveRefresh.on( 'partial-content-rendered', function() {
 			init_price_filter();
 		} );
 	}
diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js
index 3a5a8bffbad..23fe862069f 100644
--- a/assets/js/frontend/tokenization-form.js
+++ b/assets/js/frontend/tokenization-form.js
@@ -30,7 +30,7 @@ jQuery( function( $ ) {
 		);
 
 		// OR if create account is checked.
-		$( 'input#createaccount' ).change( { tokenizationForm: this }, this.onCreateAccountChange );
+		$( 'input#createaccount' ).on( 'change', { tokenizationForm: this }, this.onCreateAccountChange );
 
 		// First display.
 		this.onDisplay();
diff --git a/assets/js/frontend/woocommerce.js b/assets/js/frontend/woocommerce.js
index 169ac858226..b10ad50d951 100644
--- a/assets/js/frontend/woocommerce.js
+++ b/assets/js/frontend/woocommerce.js
@@ -14,7 +14,7 @@ jQuery( function( $ ) {
 		}
 	});
 
-	var noticeID   = $( '.woocommerce-store-notice' ).data( 'notice-id' ) || '',
+	var noticeID   = $( '.woocommerce-store-notice' ).data( 'noticeId' ) || '',
 		cookieName = 'store_notice' + noticeID;
 
 	// Check the value of that cookie and show/hide the notice accordingly
@@ -87,7 +87,11 @@ jQuery( function( $ ) {
 
 	$( '.show-password-input' ).on( 'click',
 		function() {
-			$( this ).toggleClass( 'display-password' );
+			if ( $( this ).hasClass( 'display-password' ) ) {
+				$( this ).removeClass( 'display-password' );
+			} else {
+				$( this ).addClass( 'display-password' );
+			}
 			if ( $( this ).hasClass( 'display-password' ) ) {
 				$( this ).siblings( ['input[type="password"]'] ).prop( 'type', 'text' );
 			} else {
diff --git a/assets/js/jquery-blockui/jquery.blockUI.js b/assets/js/jquery-blockui/jquery.blockUI.js
index 561c50a0825..b2cba9e0678 100644
--- a/assets/js/jquery-blockui/jquery.blockUI.js
+++ b/assets/js/jquery-blockui/jquery.blockUI.js
@@ -25,7 +25,7 @@
 		var msie = /MSIE/.test(navigator.userAgent);
 		var ie6  = /MSIE 6.0/.test(navigator.userAgent) && ! /MSIE 8.0/.test(navigator.userAgent);
 		var mode = document.documentMode || 0;
-		var setExpr = $.isFunction( document.createElement('div').style.setExpression );
+		var setExpr = 'function' === typeof document.createElement('div').style.setExpression ? document.createElement('div').style.setExpression : false;
 
 		// global $ methods for blocking/unblocking the entire page
 		$.blockUI   = function(opts) { install(window, opts); };
@@ -56,7 +56,7 @@
 
 			callBlock();
 			var nonmousedOpacity = $m.css('opacity');
-			$m.mouseover(function() {
+			$m.on( 'mouseover', function() {
 				callBlock({
 					fadeIn: 0,
 					timeout: 30000
@@ -65,7 +65,7 @@
 				var displayBlock = $('.blockMsg');
 				displayBlock.stop(); // cancel fadeout if it has started
 				displayBlock.fadeTo(300, 1); // make it easier to read the message by removing transparency
-			}).mouseout(function() {
+			}).on( 'mouseout', function() {
 				$('.blockMsg').fadeOut(1000);
 			});
 			// End konapun additions
@@ -550,9 +550,9 @@
 			// bind anchors and inputs for mouse and key events
 			var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove';
 			if (b)
-				$(document).bind(events, opts, handler);
+				$(document).on(events, opts, handler);
 			else
-				$(document).unbind(events, handler);
+				$(document).off(events, handler);
 
 		// former impl...
 		//		var $e = $('a,:input');
@@ -591,7 +591,7 @@
 				return;
 			var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
 			if (e)
-				e.focus();
+				e.trigger( 'focus' );
 		}
 
 		function center(el, x, y) {
@@ -616,4 +616,4 @@
 		setup(jQuery);
 	}
 
-})();
\ No newline at end of file
+})();
diff --git a/assets/js/jquery-cookie/jquery.cookie.js b/assets/js/jquery-cookie/jquery.cookie.js
index 5ff7fef9d6b..c0a20a07ec1 100644
--- a/assets/js/jquery-cookie/jquery.cookie.js
+++ b/assets/js/jquery-cookie/jquery.cookie.js
@@ -49,14 +49,14 @@
 
 	function read(s, converter) {
 		var value = config.raw ? s : parseCookieValue(s);
-		return $.isFunction(converter) ? converter(value) : value;
+		return 'function' === typeof converter ? converter(value) : value;
 	}
 
 	var config = $.cookie = function (key, value, options) {
 
 		// Write
 
-		if (value !== undefined && !$.isFunction(value)) {
+		if (value !== undefined && 'function' !== typeof value) {
 			options = $.extend({}, config.defaults, options);
 
 			if (typeof options.expires === 'number') {
@@ -114,4 +114,4 @@
 		return !$.cookie(key);
 	};
 
-}));
\ No newline at end of file
+}));
diff --git a/assets/js/jquery-flot/jquery.flot.js b/assets/js/jquery-flot/jquery.flot.js
index aa7e362ae1e..e56d1fb8964 100644
--- a/assets/js/jquery-flot/jquery.flot.js
+++ b/assets/js/jquery-flot/jquery.flot.js
@@ -29,7 +29,7 @@ Licensed under the MIT license.
  * V. 1.1: Fix error handling so e.g. parsing an empty string does
  * produce a color rather than just crashing.
  */
-(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]+=I}return G.normalize()};G.scale=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]*=I}return G.normalize()};G.toString=function(){if(G.a>=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return K<J?J:(K>I?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
+(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]+=I}return G.normalize()};G.scale=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]*=I}return G.normalize()};G.toString=function(){if(G.a>=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return K<J?J:(K>I?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}if('string'===typeof F){var D=F.trim().toLowerCase()}else{var D=''};if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
 
 // the actual Flot code
 (function($) {
@@ -1265,7 +1265,7 @@ Licensed under the MIT license.
             octx = overlay.context;
 
             // define which element we're listening for events on
-            eventHolder = $(overlay.element).unbind();
+            eventHolder = $(overlay.element).off();
 
             // If we're re-using a plot object, shut down the old one
 
@@ -1291,11 +1291,11 @@ Licensed under the MIT license.
                 // was fixed somewhere around 1.3.x.  We can return to using
                 // .mouseleave when we drop support for 1.2.6.
 
-                eventHolder.bind("mouseleave", onMouseLeave);
+                eventHolder.on("mouseleave", onMouseLeave);
             }
 
             if (options.grid.clickable)
-                eventHolder.click(onClick);
+                eventHolder.on( 'click', onClick );
 
             executeHooks(hooks.bindEvents, [eventHolder]);
         }
@@ -1304,9 +1304,9 @@ Licensed under the MIT license.
             if (redrawTimeout)
                 clearTimeout(redrawTimeout);
 
-            eventHolder.unbind("mousemove", onMouseMove);
-            eventHolder.unbind("mouseleave", onMouseLeave);
-            eventHolder.unbind("click", onClick);
+            eventHolder.off("mousemove", onMouseMove);
+            eventHolder.off("mouseleave", onMouseLeave);
+            eventHolder.off("click", onClick);
 
             executeHooks(hooks.shutdown, [eventHolder]);
         }
@@ -1704,7 +1704,7 @@ Licensed under the MIT license.
                 };
             }
 
-            if ($.isFunction(opts.tickFormatter))
+            if ( 'function' === typeof opts.tickFormatter )
                 axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); };
 
             if (opts.alignTicksWithAxis != null) {
@@ -1751,7 +1751,7 @@ Licensed under the MIT license.
             if (oticks == null || (typeof oticks == "number" && oticks > 0))
                 ticks = axis.tickGenerator(axis);
             else if (oticks) {
-                if ($.isFunction(oticks))
+                if ( 'function' === typeof oticks )
                     // generate the ticks
                     ticks = oticks(axis);
                 else
@@ -1875,7 +1875,7 @@ Licensed under the MIT license.
             // draw markings
             var markings = options.grid.markings;
             if (markings) {
-                if ($.isFunction(markings)) {
+                if ( 'function' === typeof markings ) {
                     axes = plot.getAxes();
                     // xmin etc. is backwards compatibility, to be
                     // removed in the future
@@ -2439,9 +2439,9 @@ Licensed under the MIT license.
                 radius = series.points.radius,
                 symbol = series.points.symbol;
 
-            // If the user sets the line width to 0, we change it to a very 
+            // If the user sets the line width to 0, we change it to a very
             // small value. A line width of 0 seems to force the default of 1.
-            // Doing the conditional here allows the shadow setting to still be 
+            // Doing the conditional here allows the shadow setting to still be
             // optional even with a lineWidth of 0.
 
             if( lw == 0 )
@@ -2659,7 +2659,7 @@ Licensed under the MIT license.
             // Sort the legend using either the default or a custom comparator
 
             if (options.legend.sorted) {
-                if ($.isFunction(options.legend.sorted)) {
+                if ( 'function' === typeof options.legend.sorted ) {
                     entries.sort(options.legend.sorted);
                 } else if (options.legend.sorted == "reverse") {
                 	entries.reverse();
diff --git a/assets/js/jquery-flot/jquery.flot.pie.js b/assets/js/jquery-flot/jquery.flot.pie.js
index 07ae3fe5512..adfa7fc6593 100644
--- a/assets/js/jquery-flot/jquery.flot.pie.js
+++ b/assets/js/jquery-flot/jquery.flot.pie.js
@@ -120,10 +120,10 @@ More detail and specific examples can be found in the included HTML file.
 			var options = plot.getOptions();
 			if (options.series.pie.show) {
 				if (options.grid.hoverable) {
-					eventHolder.unbind("mousemove").mousemove(onMouseMove);
+					eventHolder.off("mousemove").on( 'mousemove', onMouseMove );
 				}
 				if (options.grid.clickable) {
-					eventHolder.unbind("click").click(onClick);
+					eventHolder.off("click").on( 'click', onClick );
 				}
 			}
 		});
@@ -180,11 +180,11 @@ More detail and specific examples can be found in the included HTML file.
 				// new one; this is more efficient and preserves any extra data
 				// that the user may have stored in higher indexes.
 
-				if ($.isArray(value) && value.length == 1) {
+				if (Array.isArray(value) && value.length == 1) {
     				value = value[0];
 				}
 
-				if ($.isArray(value)) {
+				if (Array.isArray(value)) {
 					// Equivalent to $.isNumeric() but compatible with jQuery < 1.7
 					if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
 						value[1] = +value[1];
@@ -814,4 +814,4 @@ More detail and specific examples can be found in the included HTML file.
 		version: "1.1"
 	});
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/assets/js/jquery-flot/jquery.flot.resize.js b/assets/js/jquery-flot/jquery.flot.resize.js
index 6b2c5d402b1..ab6fe0df386 100644
--- a/assets/js/jquery-flot/jquery.flot.resize.js
+++ b/assets/js/jquery-flot/jquery.flot.resize.js
@@ -20,7 +20,7 @@ can just fix the size of their placeholders.
  * http://benalman.com/about/license/
  */
 
-(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this);
+(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if('function'===typeof l){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this);
 
 (function ($) {
     var options = { }; // no options
@@ -38,19 +38,19 @@ can just fix the size of their placeholders.
             plot.setupGrid();
             plot.draw();
         }
-        
+
         function bindEvents(plot, eventHolder) {
-            plot.getPlaceholder().resize(onResize);
+            plot.getPlaceholder().on( 'resize', onResize );
         }
 
         function shutdown(plot, eventHolder) {
-            plot.getPlaceholder().unbind("resize", onResize);
+            plot.getPlaceholder().off("resize", onResize);
         }
-        
+
         plot.hooks.bindEvents.push(bindEvents);
         plot.hooks.shutdown.push(shutdown);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/assets/js/jquery-payment/jquery.payment.js b/assets/js/jquery-payment/jquery.payment.js
index fec33d4ed68..7c2f63d833d 100644
--- a/assets/js/jquery-payment/jquery.payment.js
+++ b/assets/js/jquery-payment/jquery.payment.js
@@ -554,8 +554,8 @@ jQuery( function( $ ) {
     if (!(month && year)) {
       return false;
     }
-    month = $.trim(month);
-    year = $.trim(year);
+    month = 'string' === typeof month ? month.trim() : '';
+    year = 'string' === typeof year ? year.trim() : '';
     if (!/^\d+$/.test(month)) {
       return false;
     }
@@ -584,7 +584,7 @@ jQuery( function( $ ) {
 
   $.payment.validateCardCVC = function(cvc, type) {
     var card, _ref;
-    cvc = $.trim(cvc);
+    cvc = 'string' === typeof cvc ? cvc.trim() : '';
     if (!/^\d+$/.test(cvc)) {
       return false;
     }
diff --git a/assets/js/jquery-serializejson/jquery.serializejson.js b/assets/js/jquery-serializejson/jquery.serializejson.js
index e4259ac91e6..0c885348f0b 100644
--- a/assets/js/jquery-serializejson/jquery.serializejson.js
+++ b/assets/js/jquery-serializejson/jquery.serializejson.js
@@ -131,7 +131,7 @@
 
       if (opts.typeFunctions && type && opts.typeFunctions[type]) { // use a type if available
         parsedVal = opts.typeFunctions[type](valStr);
-      } else if (opts.parseNumbers  && f.isNumeric(valStr)) { // auto: number
+      } else if (opts.parseNumbers  && (! isNaN(valStr) && isFinite(valStr))) { // auto: number
         parsedVal = Number(valStr);
       } else if (opts.parseBooleans && (valStr === "true" || valStr === "false")) { // auto: boolean
         parsedVal = (valStr === "true");
@@ -201,17 +201,17 @@
     // depending on the options to skip values by name or type, and the data-skip-falsy attribute.
     shouldSkipFalsy: function($form, name, nameWithNoType, type, opts) {
       var f = $.serializeJSON;
-      
+
       var skipFromDataAttr = f.attrFromInputWithName($form, name, 'data-skip-falsy');
       if (skipFromDataAttr != null) {
-        return skipFromDataAttr !== 'false'; // any value is true, except if explicitly using 'false' 
+        return skipFromDataAttr !== 'false'; // any value is true, except if explicitly using 'false'
       }
 
       var optForFields = opts.skipFalsyValuesForFields;
       if (optForFields && (optForFields.indexOf(nameWithNoType) !== -1 || optForFields.indexOf(name) !== -1)) {
         return true;
       }
-      
+
       var optForTypes = opts.skipFalsyValuesForTypes;
       if (type == null) type = 'string'; // assume fields with no type are targeted as string
       if (optForTypes && optForTypes.indexOf(type) !== -1) {
@@ -314,12 +314,12 @@
 
         // '' is used to push values into the array "array[]"
         if (nextKey === '') {
-          if (f.isUndefined(o[key]) || !$.isArray(o[key])) {
+          if (f.isUndefined(o[key]) || !Array.isArray(o[key])) {
             o[key] = []; // define (or override) as array to push values
           }
         } else {
           if (opts.useIntKeysAsArrayIndex && f.isValidArrayIndex(nextKey)) { // if 1, 2, 3 ... then use an array, where nextKey is the index
-            if (f.isUndefined(o[key]) || !$.isArray(o[key])) {
+            if (f.isUndefined(o[key]) || !Array.isArray(o[key])) {
               o[key] = []; // define (or override) as array, to insert values using int keys as array indexes
             }
           } else { // for anything else, use an object, where nextKey is going to be the attribute name
diff --git a/assets/js/jquery-tiptip/jquery.tipTip.js b/assets/js/jquery-tiptip/jquery.tipTip.js
index 699335067d1..810fc3aa76d 100644
--- a/assets/js/jquery-tiptip/jquery.tipTip.js
+++ b/assets/js/jquery-tiptip/jquery.tipTip.js
@@ -58,40 +58,40 @@
 			}
 			if(org_title != ""){
 				if(!opts.content){
-					org_elem.removeAttr(opts.attribute); //remove original Attribute
+					org_elem.prop(opts.attribute, false); //remove original Attribute
 				}
 				var timeout = false;
 
 				if(opts.activation == "hover"){
-					org_elem.hover(function(){
+					org_elem.on( 'mouseenter', function(){
 						active_tiptip();
-					}, function(){
+					} ).on( 'mouseleave', function(){
 						if(!opts.keepAlive || !tiptip_holder.is(':hover')){
 							deactive_tiptip();
 						}
 					});
 					if(opts.keepAlive){
-						tiptip_holder.hover(function(){}, function(){
+						tiptip_holder.on( 'mouseenter', function(){} ).on( 'mouseleave', function(){
 							deactive_tiptip();
 						});
 					}
 				} else if(opts.activation == "focus"){
-					org_elem.focus(function(){
+					org_elem.on( 'focus', function(){
 						active_tiptip();
-					}).blur(function(){
+					}).on( 'blur', function(){
 						deactive_tiptip();
 					});
 				} else if(opts.activation == "click"){
-					org_elem.click(function(){
+					org_elem.on( 'click', function(){
 						active_tiptip();
 						return false;
-					}).hover(function(){},function(){
+					}).on( 'mouseenter', function(){} ).on( 'mouseleave' ,function(){
 						if(!opts.keepAlive){
 							deactive_tiptip();
 						}
 					});
 					if(opts.keepAlive){
-						tiptip_holder.hover(function(){}, function(){
+						tiptip_holder.on( 'mouseenter', function(){} ).on( 'mouseleave', function(){
 							deactive_tiptip();
 						});
 					}
@@ -100,7 +100,8 @@
 				function active_tiptip(){
 					opts.enter.call(this);
 					tiptip_content.html(org_title);
-					tiptip_holder.hide().removeAttr("class").css("margin","0");
+					tiptip_holder.hide().css("margin","0");
+					tiptip_holder.removeAttr('class');
 					tiptip_arrow.removeAttr("style");
 
 					var top = parseInt(org_elem.offset()['top']);
diff --git a/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js b/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js
index 16ce41d1edf..27363a295c2 100644
--- a/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js
+++ b/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js
@@ -149,7 +149,7 @@
     var self = this;
 
     // Delegate the touch handlers to the widget's element
-    self.element.bind({
+    self.element.on({
       touchstart: $.proxy(self, '_touchStart'),
       touchmove: $.proxy(self, '_touchMove'),
       touchend: $.proxy(self, '_touchEnd')
@@ -167,7 +167,7 @@
     var self = this;
 
     // Delegate the touch handlers to the widget's element
-    self.element.unbind({
+    self.element.off({
       touchstart: $.proxy(self, '_touchStart'),
       touchmove: $.proxy(self, '_touchMove'),
       touchend: $.proxy(self, '_touchEnd')
diff --git a/assets/js/prettyPhoto/jquery.prettyPhoto.js b/assets/js/prettyPhoto/jquery.prettyPhoto.js
index 2eb2b86b786..ea24b41ed26 100644
--- a/assets/js/prettyPhoto/jquery.prettyPhoto.js
+++ b/assets/js/prettyPhoto/jquery.prettyPhoto.js
@@ -108,10 +108,10 @@
 		doresize = true, scroll_pos = _get_scroll();
 
 		// Window/Keyboard events
-		$(window).unbind('resize.prettyphoto').bind('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); });
+		$(window).off('resize.prettyphoto').on('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); });
 
 		if(pp_settings.keyboard_shortcuts) {
-			$(document).unbind('keydown.prettyphoto').bind('keydown.prettyphoto',function(e){
+			$(document).off('keydown.prettyphoto').on('keydown.prettyphoto',function(e){
 				if(typeof $pp_pic_holder != 'undefined'){
 					if($pp_pic_holder.is(':visible')){
 						switch(e.keyCode){
@@ -162,7 +162,7 @@
 			_build_overlay(this); // Build the overlay {this} being the caller
 
 			if(settings.allow_resize)
-				$(window).bind('scroll.prettyphoto',function(){ _center_overlay(); });
+				$(window).on('scroll.prettyphoto',function(){ _center_overlay(); });
 
 
 			$.prettyPhoto.open();
@@ -431,7 +431,7 @@
 		*/
 		$.prettyPhoto.startSlideshow = function(){
 			if(typeof pp_slideshow == 'undefined'){
-				$pp_pic_holder.find('.pp_play').unbind('click').removeClass('pp_play').addClass('pp_pause').click(function(){
+				$pp_pic_holder.find('.pp_play').off('click').removeClass('pp_play').addClass('pp_pause').on( 'click', function(){
 					$.prettyPhoto.stopSlideshow();
 					return false;
 				});
@@ -446,7 +446,7 @@
 		* Stop the slideshow...
 		*/
 		$.prettyPhoto.stopSlideshow = function(){
-			$pp_pic_holder.find('.pp_pause').unbind('click').removeClass('pp_pause').addClass('pp_play').click(function(){
+			$pp_pic_holder.find('.pp_pause').off('click').removeClass('pp_pause').addClass('pp_play').on( 'click', function(){
 				$.prettyPhoto.startSlideshow();
 				return false;
 			});
@@ -473,7 +473,7 @@
 
 				$(this).remove(); // No more need for the prettyPhoto markup
 
-				$(window).unbind('scroll.prettyphoto');
+				$(window).off('scroll.prettyphoto');
 
 				clearHashtag();
 
@@ -739,7 +739,7 @@
 
 				$pp_gallery_li.filter(':eq('+set_position+')').addClass('selected');
 			}else{
-				$pp_pic_holder.find('.pp_content').unbind('mouseenter mouseleave');
+				$pp_pic_holder.find('.pp_content').off('mouseenter mouseleave');
 				// $pp_gallery.hide();
 			}
 		}
@@ -776,22 +776,22 @@
 
 				$pp_gallery = $('.pp_pic_holder .pp_gallery'), $pp_gallery_li = $pp_gallery.find('li'); // Set the gallery selectors
 
-				$pp_gallery.find('.pp_arrow_next').click(function(){
+				$pp_gallery.find('.pp_arrow_next').on( 'click', function(){
 					$.prettyPhoto.changeGalleryPage('next');
 					$.prettyPhoto.stopSlideshow();
 					return false;
 				});
 
-				$pp_gallery.find('.pp_arrow_previous').click(function(){
+				$pp_gallery.find('.pp_arrow_previous').on( 'click', function(){
 					$.prettyPhoto.changeGalleryPage('previous');
 					$.prettyPhoto.stopSlideshow();
 					return false;
 				});
 
-				$pp_pic_holder.find('.pp_content').hover(
+				$pp_pic_holder.find('.pp_content').on( 'mouseenter',
 					function(){
 						$pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeIn();
-					},
+					} ).on( 'mouseleave',
 					function(){
 						$pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeOut();
 					});
@@ -800,7 +800,7 @@
 				$pp_gallery_li.each(function(i){
 					$(this)
 						.find('a')
-						.click(function(){
+						.on( 'click', function(){
 							$.prettyPhoto.changePage(i);
 							$.prettyPhoto.stopSlideshow();
 							return false;
@@ -812,7 +812,7 @@
 			// Inject the play/pause if it's a slideshow
 			if(settings.slideshow){
 				$pp_pic_holder.find('.pp_nav').prepend('<a href="#" class="pp_play">Play</a>')
-				$pp_pic_holder.find('.pp_nav .pp_play').click(function(){
+				$pp_pic_holder.find('.pp_nav .pp_play').on( 'click', function(){
 					$.prettyPhoto.startSlideshow();
 					return false;
 				});
@@ -826,15 +826,15 @@
 					'height':$(document).height(),
 					'width':$(window).width()
 					})
-				.bind('click',function(){
+				.on('click',function(){
 					if(!settings.modal) $.prettyPhoto.close();
 				});
 
-			$('a.pp_close').bind('click',function(){ $.prettyPhoto.close(); return false; });
+			$('a.pp_close').on('click',function(){ $.prettyPhoto.close(); return false; });
 
 
 			if(settings.allow_expand) {
-				$('a.pp_expand').bind('click',function(e){
+				$('a.pp_expand').on('click',function(e){
 					// Expand the image
 					if($(this).hasClass('pp_expand')){
 						$(this).removeClass('pp_expand').addClass('pp_contract');
@@ -850,13 +850,13 @@
 				});
 			}
 
-			$pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').bind('click',function(){
+			$pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').on('click',function(){
 				$.prettyPhoto.changePage('previous');
 				$.prettyPhoto.stopSlideshow();
 				return false;
 			});
 
-			$pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').bind('click',function(){
+			$pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').on('click',function(){
 				$.prettyPhoto.changePage('next');
 				$.prettyPhoto.stopSlideshow();
 				return false;
@@ -879,7 +879,7 @@
 			setTimeout(function(){ $("a["+pp_settings.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger('click'); },50);
 		}
 
-		return this.unbind('click.prettyphoto').bind('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once
+		return this.off('click.prettyphoto').on('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once
 	};
 
 	function getHashtag(){
diff --git a/assets/js/select2/select2.full.js b/assets/js/select2/select2.full.js
index e750834ef5d..91ed6d34f63 100644
--- a/assets/js/select2/select2.full.js
+++ b/assets/js/select2/select2.full.js
@@ -1,27 +1,41 @@
 /*!
- * Select2 4.0.3
- * https://select2.github.io
+ * SelectWoo 1.0.9
+ * https://github.com/woocommerce/selectWoo
  *
  * Released under the MIT license
- * https://github.com/select2/select2/blob/master/LICENSE.md
+ * https://github.com/woocommerce/selectWoo/blob/master/LICENSE.md
  */
 (function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
-  } else if (typeof exports === 'object') {
+  } else if (typeof module === 'object' && module.exports) {
     // Node/CommonJS
-    factory(require('jquery'));
+    module.exports = function (root, jQuery) {
+      if (jQuery === undefined) {
+        // require('jQuery') returns a factory that requires window to
+        // build a jQuery instance, we normalize how we use modules
+        // that require this pattern but the window provided is a noop
+        // if it's defined (how jquery works)
+        if (typeof window !== 'undefined') {
+          jQuery = require('jquery');
+        }
+        else {
+          jQuery = require('jquery')(root);
+        }
+      }
+      factory(jQuery);
+      return jQuery;
+    };
   } else {
     // Browser globals
     factory(jQuery);
   }
-}(function (jQuery) {
+} (function (jQuery) {
   // This is needed so we can catch the AMD loader configuration and use it
   // The inner file should be wrapped (by `banner.start.js`) in a function that
   // returns the AMD loader references.
-  var S2 =
-(function () {
+  var S2 =(function () {
   // Restore the Select2 AMD loader so it can be used
   // Needed mostly in the language files, where the loader is not inserted
   if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
@@ -30,13 +44,11 @@
 var S2;(function () { if (!S2 || !S2.requirejs) {
 if (!S2) { S2 = {}; } else { require = S2; }
 /**
- * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/almond for details
+ * @license almond 0.3.3 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license, http://github.com/requirejs/almond/LICENSE
  */
 //Going sloppy to avoid 'use strict' string cost, but strict practices should
 //be followed.
-/*jslint sloppy: true */
 /*global setTimeout: false */
 
 var requirejs, require, define;
@@ -64,60 +76,58 @@ var requirejs, require, define;
      */
     function normalize(name, baseName) {
         var nameParts, nameSegment, mapValue, foundMap, lastIndex,
-            foundI, foundStarMap, starI, i, j, part,
+            foundI, foundStarMap, starI, i, j, part, normalizedBaseParts,
             baseParts = baseName && baseName.split("/"),
             map = config.map,
             starMap = (map && map['*']) || {};
 
         //Adjust any relative paths.
-        if (name && name.charAt(0) === ".") {
-            //If have a base name, try to normalize against it,
-            //otherwise, assume it is a top-level require that will
-            //be relative to baseUrl in the end.
-            if (baseName) {
-                name = name.split('/');
-                lastIndex = name.length - 1;
+        if (name) {
+            name = name.split('/');
+            lastIndex = name.length - 1;
 
-                // Node .js allowance:
-                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                }
+            // If wanting node ID compatibility, strip .js from end
+            // of IDs. Have to do this here, and not in nameToUrl
+            // because node allows either .js or non .js to map
+            // to same file.
+            if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+            }
 
-                //Lop off the last part of baseParts, so that . matches the
-                //"directory" and not name of the baseName's module. For instance,
-                //baseName of "one/two/three", maps to "one/two/three.js", but we
-                //want the directory, "one/two" for this normalization.
-                name = baseParts.slice(0, baseParts.length - 1).concat(name);
+            // Starts with a '.' so need the baseName
+            if (name[0].charAt(0) === '.' && baseParts) {
+                //Convert baseName to array, and lop off the last part,
+                //so that . matches that 'directory' and not name of the baseName's
+                //module. For instance, baseName of 'one/two/three', maps to
+                //'one/two/three.js', but we want the directory, 'one/two' for
+                //this normalization.
+                normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                name = normalizedBaseParts.concat(name);
+            }
 
-                //start trimDots
-                for (i = 0; i < name.length; i += 1) {
-                    part = name[i];
-                    if (part === ".") {
-                        name.splice(i, 1);
-                        i -= 1;
-                    } else if (part === "..") {
-                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
-                            //End of the line. Keep at least one non-dot
-                            //path segment at the front so it can be mapped
-                            //correctly to disk. Otherwise, there is likely
-                            //no path mapping for a path starting with '..'.
-                            //This can still fail, but catches the most reasonable
-                            //uses of ..
-                            break;
-                        } else if (i > 0) {
-                            name.splice(i - 1, 2);
-                            i -= 2;
-                        }
+            //start trimDots
+            for (i = 0; i < name.length; i++) {
+                part = name[i];
+                if (part === '.') {
+                    name.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    // If at the start, or previous value is still ..,
+                    // keep them so that when converted to a path it may
+                    // still work when converted to a path, even though
+                    // as an ID it is less than ideal. In larger point
+                    // releases, may be better to just kick out an error.
+                    if (i === 0 || (i === 1 && name[2] === '..') || name[i - 1] === '..') {
+                        continue;
+                    } else if (i > 0) {
+                        name.splice(i - 1, 2);
+                        i -= 2;
                     }
                 }
-                //end trimDots
-
-                name = name.join("/");
-            } else if (name.indexOf('./') === 0) {
-                // No baseName, so this is ID is resolved relative
-                // to baseUrl, pull off the leading dot.
-                name = name.substring(2);
             }
+            //end trimDots
+
+            name = name.join('/');
         }
 
         //Apply map config if available.
@@ -230,32 +240,39 @@ var requirejs, require, define;
         return [prefix, name];
     }
 
+    //Creates a parts array for a relName where first part is plugin ID,
+    //second part is resource ID. Assumes relName has already been normalized.
+    function makeRelParts(relName) {
+        return relName ? splitPrefix(relName) : [];
+    }
+
     /**
      * Makes a name map, normalizing the name, and using a plugin
      * for normalization if necessary. Grabs a ref to plugin
      * too, as an optimization.
      */
-    makeMap = function (name, relName) {
+    makeMap = function (name, relParts) {
         var plugin,
             parts = splitPrefix(name),
-            prefix = parts[0];
+            prefix = parts[0],
+            relResourceName = relParts[1];
 
         name = parts[1];
 
         if (prefix) {
-            prefix = normalize(prefix, relName);
+            prefix = normalize(prefix, relResourceName);
             plugin = callDep(prefix);
         }
 
         //Normalize according
         if (prefix) {
             if (plugin && plugin.normalize) {
-                name = plugin.normalize(name, makeNormalize(relName));
+                name = plugin.normalize(name, makeNormalize(relResourceName));
             } else {
-                name = normalize(name, relName);
+                name = normalize(name, relResourceName);
             }
         } else {
-            name = normalize(name, relName);
+            name = normalize(name, relResourceName);
             parts = splitPrefix(name);
             prefix = parts[0];
             name = parts[1];
@@ -302,13 +319,14 @@ var requirejs, require, define;
     };
 
     main = function (name, deps, callback, relName) {
-        var cjsModule, depName, ret, map, i,
+        var cjsModule, depName, ret, map, i, relParts,
             args = [],
             callbackType = typeof callback,
             usingExports;
 
         //Use name if no relName
         relName = relName || name;
+        relParts = makeRelParts(relName);
 
         //Call the callback to define the module, if necessary.
         if (callbackType === 'undefined' || callbackType === 'function') {
@@ -317,7 +335,7 @@ var requirejs, require, define;
             //Default to [require, exports, module] if no deps
             deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
             for (i = 0; i < deps.length; i += 1) {
-                map = makeMap(deps[i], relName);
+                map = makeMap(deps[i], relParts);
                 depName = map.f;
 
                 //Fast path CommonJS standard dependencies.
@@ -373,7 +391,7 @@ var requirejs, require, define;
             //deps arg is the module name, and second arg (if passed)
             //is just the relName.
             //Normalize module name, if it contains . or ..
-            return callDep(makeMap(deps, callback).f);
+            return callDep(makeMap(deps, makeRelParts(callback)).f);
         } else if (!deps.splice) {
             //deps is a config object, not an array.
             config = deps;
@@ -737,6 +755,12 @@ S2.define('select2/utils',[
     });
   };
 
+  Utils.entityDecode = function (html) {
+    var txt = document.createElement('textarea');
+    txt.innerHTML = html;
+    return txt.value;
+  }
+
   // Append an array of jQuery nodes to a given element.
   Utils.appendMany = function ($element, $nodes) {
     // jQuery 1.7.x does not support $.fn.append() with an array
@@ -754,6 +778,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -773,7 +805,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox" tabindex="-1"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -796,7 +828,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -858,9 +890,9 @@ S2.define('select2/results',[
 
   Results.prototype.highlightFirstItem = function () {
     var $options = this.$results
-      .find('.select2-results__option[aria-selected]');
+      .find('.select2-results__option[data-selected]');
 
-    var $selected = $options.filter('[aria-selected=true]');
+    var $selected = $options.filter('[data-selected=true]');
 
     // Check if there are any selected options
     if ($selected.length > 0) {
@@ -884,7 +916,7 @@ S2.define('select2/results',[
       });
 
       var $options = self.$results
-        .find('.select2-results__option[aria-selected]');
+        .find('.select2-results__option[data-selected]');
 
       $options.each(function () {
         var $option = $(this);
@@ -896,9 +928,9 @@ S2.define('select2/results',[
 
         if ((item.element != null && item.element.selected) ||
             (item.element == null && $.inArray(id, selectedIds) > -1)) {
-          $option.attr('aria-selected', 'true');
+          $option.attr('data-selected', 'true');
         } else {
-          $option.attr('aria-selected', 'false');
+          $option.attr('data-selected', 'false');
         }
       });
 
@@ -930,17 +962,18 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
-      'aria-selected': 'false'
+      'role': 'option',
+      'data-selected': 'false',
+      'tabindex': -1
     };
 
     if (data.disabled) {
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
       attrs['aria-disabled'] = 'true';
     }
 
     if (data.id == null) {
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
     }
 
     if (data._resultId != null) {
@@ -952,9 +985,8 @@ S2.define('select2/results',[
     }
 
     if (data.children) {
-      attrs.role = 'group';
       attrs['aria-label'] = data.text;
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
     }
 
     for (var attr in attrs) {
@@ -971,6 +1003,7 @@ S2.define('select2/results',[
 
       var $label = $(label);
       this.template(data, label);
+      $label.attr('role', 'presentation');
 
       var $children = [];
 
@@ -983,10 +1016,11 @@ S2.define('select2/results',[
       }
 
       var $childrenContainer = $('<ul></ul>', {
-        'class': 'select2-results__options select2-results__options--nested'
+        'class': 'select2-results__options select2-results__options--nested',
+        'role': 'listbox'
       });
-
       $childrenContainer.append($children);
+      $option.attr('role', 'list');
 
       $option.append(label);
       $option.append($childrenContainer);
@@ -1082,7 +1116,7 @@ S2.define('select2/results',[
 
       var data = $highlighted.data('data');
 
-      if ($highlighted.attr('aria-selected') == 'true') {
+      if ($highlighted.attr('data-selected') == 'true') {
         self.trigger('close', {});
       } else {
         self.trigger('select', {
@@ -1094,7 +1128,7 @@ S2.define('select2/results',[
     container.on('results:previous', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('[data-selected]');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1128,7 +1162,7 @@ S2.define('select2/results',[
     container.on('results:next', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('[data-selected]');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1156,7 +1190,8 @@ S2.define('select2/results',[
     });
 
     container.on('results:focus', function (params) {
-      params.element.addClass('select2-results__option--highlighted');
+      params.element.addClass('select2-results__option--highlighted').attr('aria-selected', 'true');
+      self.$results.attr('aria-activedescendant', params.element.attr('id'));
     });
 
     container.on('results:message', function (params) {
@@ -1188,13 +1223,13 @@ S2.define('select2/results',[
       });
     }
 
-    this.$results.on('mouseup', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseup', '.select2-results__option[data-selected]',
       function (evt) {
       var $this = $(this);
 
       var data = $this.data('data');
 
-      if ($this.attr('aria-selected') === 'true') {
+      if ($this.attr('data-selected') === 'true') {
         if (self.options.get('multiple')) {
           self.trigger('unselect', {
             originalEvent: evt,
@@ -1213,12 +1248,13 @@ S2.define('select2/results',[
       });
     });
 
-    this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseenter', '.select2-results__option[data-selected]',
       function (evt) {
       var data = $(this).data('data');
 
       self.getHighlightedResults()
-          .removeClass('select2-results__option--highlighted');
+          .removeClass('select2-results__option--highlighted')
+          .attr('aria-selected', 'false');
 
       self.trigger('results:focus', {
         data: data,
@@ -1245,7 +1281,7 @@ S2.define('select2/results',[
       return;
     }
 
-    var $options = this.$results.find('[aria-selected]');
+    var $options = this.$results.find('[data-selected]');
 
     var currentIndex = $options.index($highlighted);
 
@@ -1323,7 +1359,7 @@ S2.define('select2/selection/base',[
 
   BaseSelection.prototype.render = function () {
     var $selection = $(
-      '<span class="select2-selection" role="combobox" ' +
+      '<span class="select2-selection" ' +
       ' aria-haspopup="true" aria-expanded="false">' +
       '</span>'
     );
@@ -1349,6 +1385,7 @@ S2.define('select2/selection/base',[
 
     var id = container.id + '-container';
     var resultsId = container.id + '-results';
+    var searchHidden = this.options.get('minimumResultsForSearch') === Infinity;
 
     this.container = container;
 
@@ -1390,7 +1427,11 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      // This needs to be delayed as the active element is the body when the
+      // key is pressed.
+      window.setTimeout(function () {
+        self.$selection.trigger( 'focus' );
+      }, 1);
 
       self._detachCloseHandler(container);
     });
@@ -1440,8 +1481,14 @@ S2.define('select2/selection/base',[
         }
 
         var $element = $this.data('element');
-
         $element.select2('close');
+
+        // Remove any focus when dropdown is closed by clicking outside the select area.
+        // Timeout of 1 required for close to finish wrapping up.
+        setTimeout(function(){
+         $this.find('*:focus').blur();
+         $target.focus();
+        }, 1);
       });
     });
   };
@@ -1500,8 +1547,21 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
-    this.$selection.attr('aria-labelledby', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
+
+    var label = this.options.get( 'label' );
+
+    if ( typeof( label ) === 'string' ) {
+      this.$selection.attr( 'aria-label', label );
+    } else {
+      this.$selection.attr( 'aria-labelledby', id );
+    }
+
+    // This makes single non-search selects work in screen readers. If it causes problems elsewhere, remove.
+    this.$selection.attr('role', 'combobox');
 
     this.$selection.on('mousedown', function (evt) {
       // Only respond to left clicks
@@ -1518,13 +1578,20 @@ S2.define('select2/selection/single',[
       // User focuses on the container
     });
 
+    this.$selection.on('keydown', function (evt) {
+      // If user starts typing an alphanumeric key on the keyboard, open if not opened.
+      if (!container.isOpen() && evt.which >= 48 && evt.which <= 90) {
+        container.open();
+      }
+    });
+
     this.$selection.on('blur', function (evt) {
       // User exits the container
     });
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1557,9 +1624,9 @@ S2.define('select2/selection/single',[
     var selection = data[0];
 
     var $rendered = this.$selection.find('.select2-selection__rendered');
-    var formatted = this.display(selection, $rendered);
+    var formatted = Utils.entityDecode(this.display(selection, $rendered));
 
-    $rendered.empty().append(formatted);
+    $rendered.empty().text(formatted);
     $rendered.prop('title', selection.title || selection.text);
   };
 
@@ -1583,7 +1650,7 @@ S2.define('select2/selection/multiple',[
     $selection.addClass('select2-selection--multiple');
 
     $selection.html(
-      '<ul class="select2-selection__rendered"></ul>'
+      '<ul class="select2-selection__rendered" aria-live="polite" aria-relevant="additions removals" aria-atomic="true"></ul>'
     );
 
     return $selection;
@@ -1620,6 +1687,18 @@ S2.define('select2/selection/multiple',[
         });
       }
     );
+
+    this.$selection.on('keydown', function (evt) {
+      // If user starts typing an alphanumeric key on the keyboard, open if not opened.
+      if (!container.isOpen() && evt.which >= 48 && evt.which <= 90) {
+        container.open();
+      }
+    });
+
+    // Focus on the search field when the container is focused instead of the main container.
+    container.on( 'focus', function(){
+      self.focusOnSearch();
+    });
   };
 
   MultipleSelection.prototype.clear = function () {
@@ -1636,7 +1715,7 @@ S2.define('select2/selection/multiple',[
   MultipleSelection.prototype.selectionContainer = function () {
     var $container = $(
       '<li class="select2-selection__choice">' +
-        '<span class="select2-selection__choice__remove" role="presentation">' +
+        '<span class="select2-selection__choice__remove" role="presentation" aria-hidden="true">' +
           '&times;' +
         '</span>' +
       '</li>'
@@ -1645,6 +1724,24 @@ S2.define('select2/selection/multiple',[
     return $container;
   };
 
+  /**
+   * Focus on the search field instead of the main multiselect container.
+   */
+  MultipleSelection.prototype.focusOnSearch = function() {
+    var self = this;
+
+    if ('undefined' !== typeof self.$search) {
+      // Needs 1 ms delay because of other 1 ms setTimeouts when rendering.
+      setTimeout(function(){
+        // Prevent the dropdown opening again when focused from this.
+        // This gets reset automatically when focus is triggered.
+        self._keyUpPrevented = true;
+
+        self.$search.focus();
+      }, 1);
+    }
+  }
+
   MultipleSelection.prototype.update = function (data) {
     this.clear();
 
@@ -1658,9 +1755,14 @@ S2.define('select2/selection/multiple',[
       var selection = data[d];
 
       var $selection = this.selectionContainer();
+      var removeItemTag = $selection.html();
       var formatted = this.display(selection, $selection);
+      if ('string' === typeof formatted) {
+        formatted = Utils.entityDecode(formatted.trim());
+      }
 
-      $selection.append(formatted);
+      $selection.text(formatted);
+      $selection.prepend(removeItemTag);
       $selection.prop('title', selection.title || selection.text);
 
       $selection.data('data', selection);
@@ -1699,7 +1801,7 @@ S2.define('select2/selection/placeholder',[
   Placeholder.prototype.createPlaceholder = function (decorated, placeholder) {
     var $placeholder = this.selectionContainer();
 
-    $placeholder.html(this.display(placeholder));
+    $placeholder.text(Utils.entityDecode(this.display(placeholder)));
     $placeholder.addClass('select2-selection__placeholder')
                 .removeClass('select2-selection__choice');
 
@@ -1836,8 +1938,8 @@ S2.define('select2/selection/search',[
   Search.prototype.render = function (decorated) {
     var $search = $(
       '<li class="select2-search select2-search--inline">' +
-        '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        '<input class="select2-search__field" type="text" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
         ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
       '</li>'
     );
@@ -1854,16 +1956,19 @@ S2.define('select2/selection/search',[
 
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
+    var resultsId = container.id + '-results';
 
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-owns', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
       self.$search.removeAttr('aria-activedescendant');
+      self.$search.removeAttr('aria-owns');
       self.$search.trigger('focus');
     });
 
@@ -1882,7 +1987,7 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      self.$search.attr('aria-activedescendant', params.data._resultId);
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1913,6 +2018,9 @@ S2.define('select2/selection/search',[
 
           evt.preventDefault();
         }
+      } else if (evt.which === KEYS.ENTER) {
+        container.open();
+        evt.preventDefault();
       }
     });
 
@@ -2001,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3004,8 +3112,15 @@ S2.define('select2/data/base',[
   };
 
   BaseAdapter.prototype.generateResultId = function (container, data) {
-    var id = container.id + '-result-';
+    var id = '';
 
+    if (container != null) {
+      id += container.id
+    } else {
+      id += Utils.generateChars(4);
+    }
+
+    id += '-result-';
     id += Utils.generateChars(4);
 
     if (data.id != null) {
@@ -3191,7 +3306,7 @@ S2.define('select2/data/select',[
       }
     }
 
-    if (data.id) {
+    if (data.id !== undefined) {
       option.value = data.id;
     }
 
@@ -3289,7 +3404,7 @@ S2.define('select2/data/select',[
       item.text = item.text.toString();
     }
 
-    if (item._resultId == null && item.id && this.container != null) {
+    if (item._resultId == null && item.id) {
       item._resultId = this.generateResultId(this.container, item);
     }
 
@@ -3432,7 +3547,7 @@ S2.define('select2/data/ajax',[
 
     if (this._request != null) {
       // JSONP requests cannot always be aborted
-      if ($.isFunction(this._request.abort)) {
+      if ( typeof this._request.abort === 'function' ) {
         this._request.abort();
       }
 
@@ -3457,7 +3572,7 @@ S2.define('select2/data/ajax',[
 
         if (self.options.get('debug') && window.console && console.error) {
           // Check to make sure that the response included a `results` key.
-          if (!results || !results.results || !$.isArray(results.results)) {
+          if (!results || !results.results || ! Array.isArray( results.results ) ) {
             console.error(
               'Select2: The AJAX results did not return an array in the ' +
               '`results` key of the response.'
@@ -3466,6 +3581,7 @@ S2.define('select2/data/ajax',[
         }
 
         callback(results);
+        self.container.focusOnActiveElement();
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
@@ -3515,7 +3631,7 @@ S2.define('select2/data/tags',[
 
     decorated.call(this, $element, options);
 
-    if ($.isArray(tags)) {
+    if ( Array.isArray( tags ) ) {
       for (var t = 0; t < tags.length; t++) {
         var tag = tags[t];
         var item = this._normalizeItem(tag);
@@ -3550,7 +3666,10 @@ S2.define('select2/data/tags',[
           }, true)
         );
 
-        var checkText = option.text === params.term;
+        var optionText = (option.text || '').toUpperCase();
+        var paramsTerm = (params.term || '').toUpperCase();
+
+        var checkText = optionText === paramsTerm;
 
         if (checkText || checkChildren) {
           if (child) {
@@ -3588,7 +3707,7 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype.createTag = function (decorated, params) {
-    var term = $.trim(params.term);
+    var term = params.term.trim();
 
     if (term === '') {
       return null;
@@ -3681,7 +3800,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger( 'focus' );
       }
 
       params.term = tokenData.term;
@@ -3887,9 +4006,9 @@ S2.define('select2/dropdown/search',[
 
     var $search = $(
       '<span class="select2-search select2-search--dropdown">' +
-        '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
-        ' spellcheck="false" role="textbox" />' +
+        '<input class="select2-search__field" type="text" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
+        ' spellcheck="false" role="combobox" aria-autocomplete="list" aria-expanded="true" />' +
       '</span>'
     );
 
@@ -3903,6 +4022,7 @@ S2.define('select2/dropdown/search',[
 
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
+    var resultsId = container.id + '-results';
 
     decorated.call(this, container, $container);
 
@@ -3926,23 +4046,24 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
-
-      self.$search.focus();
+      self.$search.attr('aria-owns', resultsId);
+      self.$search.trigger( 'focus' );
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
-
+      self.$search.removeAttr('aria-activedescendant');
+      self.$search.removeAttr('aria-owns');
       self.$search.val('');
     });
 
     container.on('focus', function () {
-      if (container.isOpen()) {
-        self.$search.focus();
+      if (!container.isOpen()) {
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -3957,6 +4078,10 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      self.$search.attr('aria-activedescendant', params.data._resultId);
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4098,7 +4223,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4753,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4816,7 +4941,7 @@ S2.define('select2/defaults',[
 
     function matcher (params, data) {
       // Always return the object if there is nothing to compare
-      if ($.trim(params.term) === '') {
+      if ( params.term.trim() === '' ) {
         return data;
       }
 
@@ -5344,16 +5469,22 @@ S2.define('select2/core',[
       });
     });
 
-    this.on('keypress', function (evt) {
-      var key = evt.which;
+    this.on('open', function(){
+      // Focus on the active element when opening dropdown.
+      // Needs 1 ms delay because of other 1 ms setTimeouts when rendering.
+      setTimeout(function(){
+        self.focusOnActiveElement();
+      }, 1);
+    });
 
+    $(document).on('keydown', function (evt) {
+      var key = evt.which;
       if (self.isOpen()) {
-        if (key === KEYS.ESC || key === KEYS.TAB ||
-            (key === KEYS.UP && evt.altKey)) {
+        if (key === KEYS.ESC || (key === KEYS.UP && evt.altKey)) {
           self.close();
 
           evt.preventDefault();
-        } else if (key === KEYS.ENTER) {
+        } else if (key === KEYS.ENTER || key === KEYS.TAB) {
           self.trigger('results:select', {});
 
           evt.preventDefault();
@@ -5370,17 +5501,42 @@ S2.define('select2/core',[
 
           evt.preventDefault();
         }
-      } else {
-        if (key === KEYS.ENTER || key === KEYS.SPACE ||
-            (key === KEYS.DOWN && evt.altKey)) {
-          self.open();
 
+        var $searchField = self.$dropdown.find('.select2-search__field');
+        if (! $searchField.length) {
+          $searchField = self.$container.find('.select2-search__field');
+        }
+
+        // Move the focus to the selected element on keyboard navigation.
+        // Required for screen readers to work properly.
+        if (key === KEYS.DOWN || key === KEYS.UP) {
+            self.focusOnActiveElement();
+        } else {
+          // Focus on the search if user starts typing.
+          $searchField.focus();
+          // Focus back to active selection when finished typing.
+          // Small delay so typed character can be read by screen reader.
+          setTimeout(function(){
+              self.focusOnActiveElement();
+          }, 1000);
+        }
+      } else if (self.hasFocus()) {
+        if (key === KEYS.ENTER || key === KEYS.SPACE ||
+            key === KEYS.DOWN) {
+          self.open();
           evt.preventDefault();
         }
       }
     });
   };
 
+  Select2.prototype.focusOnActiveElement = function () {
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (this.isOpen() && ! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
+  };
+
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
@@ -5568,7 +5724,7 @@ S2.define('select2/core',[
 
     var newVal = args[0];
 
-    if ($.isArray(newVal)) {
+    if ( Array.isArray( newVal ) ) {
       newVal = $.map(newVal, function (obj) {
         return obj.toString();
       });
@@ -5645,7 +5801,7 @@ S2.define('select2/compat/utils',[
   function syncCssClasses ($dest, $src, adapter) {
     var classes, replacements = [], adapted;
 
-    classes = $.trim($dest.attr('class'));
+    classes = $dest.attr('class').trim();
 
     if (classes) {
       classes = '' + classes; // for IE which returns object
@@ -5658,7 +5814,7 @@ S2.define('select2/compat/utils',[
       });
     }
 
-    classes = $.trim($src.attr('class'));
+    classes = $src.attr('class').trim();
 
     if (classes) {
       classes = '' + classes; // for IE which returns object
@@ -5699,7 +5855,7 @@ S2.define('select2/compat/containerCss',[
 
     var containerCssClass = this.options.get('containerCssClass') || '';
 
-    if ($.isFunction(containerCssClass)) {
+    if ( typeof containerCssClass === 'function' ) {
       containerCssClass = containerCssClass(this.$element);
     }
 
@@ -5725,7 +5881,7 @@ S2.define('select2/compat/containerCss',[
 
     var containerCss = this.options.get('containerCss') || {};
 
-    if ($.isFunction(containerCss)) {
+    if ( typeof containerCss === 'function' ) {
       containerCss = containerCss(this.$element);
     }
 
@@ -5756,7 +5912,7 @@ S2.define('select2/compat/dropdownCss',[
 
     var dropdownCssClass = this.options.get('dropdownCssClass') || '';
 
-    if ($.isFunction(dropdownCssClass)) {
+    if ( typeof dropdownCssClass === 'function' ) {
       dropdownCssClass = dropdownCssClass(this.$element);
     }
 
@@ -5782,7 +5938,7 @@ S2.define('select2/compat/dropdownCss',[
 
     var dropdownCss = this.options.get('dropdownCss') || {};
 
-    if ($.isFunction(dropdownCss)) {
+    if ( typeof dropdownCss === 'function' ) {
       dropdownCss = dropdownCss(this.$element);
     }
 
@@ -5829,7 +5985,7 @@ S2.define('select2/compat/initSelection',[
     this.initSelection.call(null, this.$element, function (data) {
       self._isInitialized = true;
 
-      if (!$.isArray(data)) {
+      if ( ! Array.isArray( data ) ) {
         data = [data];
       }
 
@@ -5975,7 +6131,7 @@ S2.define('select2/compat/matcher',[
     function wrappedMatcher (params, data) {
       var match = $.extend(true, {}, data);
 
-      if (params.term == null || $.trim(params.term) === '') {
+      if (params.term == null || params.term.trim() === '') {
         return match;
       }
 
@@ -6218,11 +6374,11 @@ S2.define('select2/selection/stopPropagation',[
 
     $.fn.extend({
         mousewheel: function(fn) {
-            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+            return fn ? this.on('mousewheel', fn) : this.trigger('mousewheel');
         },
 
         unmousewheel: function(fn) {
-            return this.unbind('mousewheel', fn);
+            return this.off('mousewheel', fn);
         }
     });
 
@@ -6364,11 +6520,11 @@ S2.define('jquery.select2',[
   './select2/core',
   './select2/defaults'
 ], function ($, _, Select2, Defaults) {
-  if ($.fn.select2 == null) {
+  if ($.fn.selectWoo == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
 
-    $.fn.select2 = function (options) {
+    $.fn.selectWoo = function (options) {
       options = options || {};
 
       if (typeof options === 'object') {
@@ -6408,10 +6564,17 @@ S2.define('jquery.select2',[
     };
   }
 
-  if ($.fn.select2.defaults == null) {
-    $.fn.select2.defaults = Defaults;
+  if ($.fn.select2 != null && $.fn.select2.defaults != null) {
+    $.fn.selectWoo.defaults = $.fn.select2.defaults;
   }
 
+  if ($.fn.selectWoo.defaults == null) {
+    $.fn.selectWoo.defaults = Defaults;
+  }
+
+  // Also register selectWoo under select2 if select2 is not already present.
+  $.fn.select2 = $.fn.select2 || $.fn.selectWoo;
+
   return Select2;
 });
 
@@ -6430,6 +6593,7 @@ S2.define('jquery.select2',[
   // This allows Select2 to use the internal loader outside of this file, such
   // as in the language files.
   jQuery.fn.select2.amd = S2;
+  jQuery.fn.selectWoo.amd = S2;
 
   // Return the Select2 instance for anyone who is importing it.
   return select2;
diff --git a/assets/js/select2/select2.js b/assets/js/select2/select2.js
index 13b84fadff6..99431250b9a 100644
--- a/assets/js/select2/select2.js
+++ b/assets/js/select2/select2.js
@@ -1,27 +1,41 @@
 /*!
- * Select2 4.0.3
- * https://select2.github.io
+ * SelectWoo 1.0.9
+ * https://github.com/woocommerce/selectWoo
  *
  * Released under the MIT license
- * https://github.com/select2/select2/blob/master/LICENSE.md
+ * https://github.com/woocommerce/selectWoo/blob/master/LICENSE.md
  */
 (function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
-  } else if (typeof exports === 'object') {
+  } else if (typeof module === 'object' && module.exports) {
     // Node/CommonJS
-    factory(require('jquery'));
+    module.exports = function (root, jQuery) {
+      if (jQuery === undefined) {
+        // require('jQuery') returns a factory that requires window to
+        // build a jQuery instance, we normalize how we use modules
+        // that require this pattern but the window provided is a noop
+        // if it's defined (how jquery works)
+        if (typeof window !== 'undefined') {
+          jQuery = require('jquery');
+        }
+        else {
+          jQuery = require('jquery')(root);
+        }
+      }
+      factory(jQuery);
+      return jQuery;
+    };
   } else {
     // Browser globals
     factory(jQuery);
   }
-}(function (jQuery) {
+} (function (jQuery) {
   // This is needed so we can catch the AMD loader configuration and use it
   // The inner file should be wrapped (by `banner.start.js`) in a function that
   // returns the AMD loader references.
-  var S2 =
-(function () {
+  var S2 =(function () {
   // Restore the Select2 AMD loader so it can be used
   // Needed mostly in the language files, where the loader is not inserted
   if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
@@ -30,13 +44,11 @@
 var S2;(function () { if (!S2 || !S2.requirejs) {
 if (!S2) { S2 = {}; } else { require = S2; }
 /**
- * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/almond for details
+ * @license almond 0.3.3 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license, http://github.com/requirejs/almond/LICENSE
  */
 //Going sloppy to avoid 'use strict' string cost, but strict practices should
 //be followed.
-/*jslint sloppy: true */
 /*global setTimeout: false */
 
 var requirejs, require, define;
@@ -64,60 +76,58 @@ var requirejs, require, define;
      */
     function normalize(name, baseName) {
         var nameParts, nameSegment, mapValue, foundMap, lastIndex,
-            foundI, foundStarMap, starI, i, j, part,
+            foundI, foundStarMap, starI, i, j, part, normalizedBaseParts,
             baseParts = baseName && baseName.split("/"),
             map = config.map,
             starMap = (map && map['*']) || {};
 
         //Adjust any relative paths.
-        if (name && name.charAt(0) === ".") {
-            //If have a base name, try to normalize against it,
-            //otherwise, assume it is a top-level require that will
-            //be relative to baseUrl in the end.
-            if (baseName) {
-                name = name.split('/');
-                lastIndex = name.length - 1;
+        if (name) {
+            name = name.split('/');
+            lastIndex = name.length - 1;
 
-                // Node .js allowance:
-                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                }
+            // If wanting node ID compatibility, strip .js from end
+            // of IDs. Have to do this here, and not in nameToUrl
+            // because node allows either .js or non .js to map
+            // to same file.
+            if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+            }
 
-                //Lop off the last part of baseParts, so that . matches the
-                //"directory" and not name of the baseName's module. For instance,
-                //baseName of "one/two/three", maps to "one/two/three.js", but we
-                //want the directory, "one/two" for this normalization.
-                name = baseParts.slice(0, baseParts.length - 1).concat(name);
+            // Starts with a '.' so need the baseName
+            if (name[0].charAt(0) === '.' && baseParts) {
+                //Convert baseName to array, and lop off the last part,
+                //so that . matches that 'directory' and not name of the baseName's
+                //module. For instance, baseName of 'one/two/three', maps to
+                //'one/two/three.js', but we want the directory, 'one/two' for
+                //this normalization.
+                normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                name = normalizedBaseParts.concat(name);
+            }
 
-                //start trimDots
-                for (i = 0; i < name.length; i += 1) {
-                    part = name[i];
-                    if (part === ".") {
-                        name.splice(i, 1);
-                        i -= 1;
-                    } else if (part === "..") {
-                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
-                            //End of the line. Keep at least one non-dot
-                            //path segment at the front so it can be mapped
-                            //correctly to disk. Otherwise, there is likely
-                            //no path mapping for a path starting with '..'.
-                            //This can still fail, but catches the most reasonable
-                            //uses of ..
-                            break;
-                        } else if (i > 0) {
-                            name.splice(i - 1, 2);
-                            i -= 2;
-                        }
+            //start trimDots
+            for (i = 0; i < name.length; i++) {
+                part = name[i];
+                if (part === '.') {
+                    name.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    // If at the start, or previous value is still ..,
+                    // keep them so that when converted to a path it may
+                    // still work when converted to a path, even though
+                    // as an ID it is less than ideal. In larger point
+                    // releases, may be better to just kick out an error.
+                    if (i === 0 || (i === 1 && name[2] === '..') || name[i - 1] === '..') {
+                        continue;
+                    } else if (i > 0) {
+                        name.splice(i - 1, 2);
+                        i -= 2;
                     }
                 }
-                //end trimDots
-
-                name = name.join("/");
-            } else if (name.indexOf('./') === 0) {
-                // No baseName, so this is ID is resolved relative
-                // to baseUrl, pull off the leading dot.
-                name = name.substring(2);
             }
+            //end trimDots
+
+            name = name.join('/');
         }
 
         //Apply map config if available.
@@ -230,32 +240,39 @@ var requirejs, require, define;
         return [prefix, name];
     }
 
+    //Creates a parts array for a relName where first part is plugin ID,
+    //second part is resource ID. Assumes relName has already been normalized.
+    function makeRelParts(relName) {
+        return relName ? splitPrefix(relName) : [];
+    }
+
     /**
      * Makes a name map, normalizing the name, and using a plugin
      * for normalization if necessary. Grabs a ref to plugin
      * too, as an optimization.
      */
-    makeMap = function (name, relName) {
+    makeMap = function (name, relParts) {
         var plugin,
             parts = splitPrefix(name),
-            prefix = parts[0];
+            prefix = parts[0],
+            relResourceName = relParts[1];
 
         name = parts[1];
 
         if (prefix) {
-            prefix = normalize(prefix, relName);
+            prefix = normalize(prefix, relResourceName);
             plugin = callDep(prefix);
         }
 
         //Normalize according
         if (prefix) {
             if (plugin && plugin.normalize) {
-                name = plugin.normalize(name, makeNormalize(relName));
+                name = plugin.normalize(name, makeNormalize(relResourceName));
             } else {
-                name = normalize(name, relName);
+                name = normalize(name, relResourceName);
             }
         } else {
-            name = normalize(name, relName);
+            name = normalize(name, relResourceName);
             parts = splitPrefix(name);
             prefix = parts[0];
             name = parts[1];
@@ -302,13 +319,14 @@ var requirejs, require, define;
     };
 
     main = function (name, deps, callback, relName) {
-        var cjsModule, depName, ret, map, i,
+        var cjsModule, depName, ret, map, i, relParts,
             args = [],
             callbackType = typeof callback,
             usingExports;
 
         //Use name if no relName
         relName = relName || name;
+        relParts = makeRelParts(relName);
 
         //Call the callback to define the module, if necessary.
         if (callbackType === 'undefined' || callbackType === 'function') {
@@ -317,7 +335,7 @@ var requirejs, require, define;
             //Default to [require, exports, module] if no deps
             deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
             for (i = 0; i < deps.length; i += 1) {
-                map = makeMap(deps[i], relName);
+                map = makeMap(deps[i], relParts);
                 depName = map.f;
 
                 //Fast path CommonJS standard dependencies.
@@ -373,7 +391,7 @@ var requirejs, require, define;
             //deps arg is the module name, and second arg (if passed)
             //is just the relName.
             //Normalize module name, if it contains . or ..
-            return callDep(makeMap(deps, callback).f);
+            return callDep(makeMap(deps, makeRelParts(callback)).f);
         } else if (!deps.splice) {
             //deps is a config object, not an array.
             config = deps;
@@ -737,6 +755,12 @@ S2.define('select2/utils',[
     });
   };
 
+  Utils.entityDecode = function (html) {
+    var txt = document.createElement('textarea');
+    txt.innerHTML = html;
+    return txt.value;
+  }
+
   // Append an array of jQuery nodes to a given element.
   Utils.appendMany = function ($element, $nodes) {
     // jQuery 1.7.x does not support $.fn.append() with an array
@@ -754,6 +778,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -773,7 +805,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox" tabindex="-1"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -796,7 +828,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -858,9 +890,9 @@ S2.define('select2/results',[
 
   Results.prototype.highlightFirstItem = function () {
     var $options = this.$results
-      .find('.select2-results__option[aria-selected]');
+      .find('.select2-results__option[data-selected]');
 
-    var $selected = $options.filter('[aria-selected=true]');
+    var $selected = $options.filter('[data-selected=true]');
 
     // Check if there are any selected options
     if ($selected.length > 0) {
@@ -884,7 +916,7 @@ S2.define('select2/results',[
       });
 
       var $options = self.$results
-        .find('.select2-results__option[aria-selected]');
+        .find('.select2-results__option[data-selected]');
 
       $options.each(function () {
         var $option = $(this);
@@ -896,9 +928,9 @@ S2.define('select2/results',[
 
         if ((item.element != null && item.element.selected) ||
             (item.element == null && $.inArray(id, selectedIds) > -1)) {
-          $option.attr('aria-selected', 'true');
+          $option.attr('data-selected', 'true');
         } else {
-          $option.attr('aria-selected', 'false');
+          $option.attr('data-selected', 'false');
         }
       });
 
@@ -930,17 +962,18 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
-      'aria-selected': 'false'
+      'role': 'option',
+      'data-selected': 'false',
+      'tabindex': -1
     };
 
     if (data.disabled) {
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
       attrs['aria-disabled'] = 'true';
     }
 
     if (data.id == null) {
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
     }
 
     if (data._resultId != null) {
@@ -952,9 +985,8 @@ S2.define('select2/results',[
     }
 
     if (data.children) {
-      attrs.role = 'group';
       attrs['aria-label'] = data.text;
-      delete attrs['aria-selected'];
+      delete attrs['data-selected'];
     }
 
     for (var attr in attrs) {
@@ -971,6 +1003,7 @@ S2.define('select2/results',[
 
       var $label = $(label);
       this.template(data, label);
+      $label.attr('role', 'presentation');
 
       var $children = [];
 
@@ -983,10 +1016,11 @@ S2.define('select2/results',[
       }
 
       var $childrenContainer = $('<ul></ul>', {
-        'class': 'select2-results__options select2-results__options--nested'
+        'class': 'select2-results__options select2-results__options--nested',
+        'role': 'listbox'
       });
-
       $childrenContainer.append($children);
+      $option.attr('role', 'list');
 
       $option.append(label);
       $option.append($childrenContainer);
@@ -1082,7 +1116,7 @@ S2.define('select2/results',[
 
       var data = $highlighted.data('data');
 
-      if ($highlighted.attr('aria-selected') == 'true') {
+      if ($highlighted.attr('data-selected') == 'true') {
         self.trigger('close', {});
       } else {
         self.trigger('select', {
@@ -1094,7 +1128,7 @@ S2.define('select2/results',[
     container.on('results:previous', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('[data-selected]');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1128,7 +1162,7 @@ S2.define('select2/results',[
     container.on('results:next', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('[data-selected]');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1156,7 +1190,8 @@ S2.define('select2/results',[
     });
 
     container.on('results:focus', function (params) {
-      params.element.addClass('select2-results__option--highlighted');
+      params.element.addClass('select2-results__option--highlighted').attr('aria-selected', 'true');
+      self.$results.attr('aria-activedescendant', params.element.attr('id'));
     });
 
     container.on('results:message', function (params) {
@@ -1188,13 +1223,13 @@ S2.define('select2/results',[
       });
     }
 
-    this.$results.on('mouseup', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseup', '.select2-results__option[data-selected]',
       function (evt) {
       var $this = $(this);
 
       var data = $this.data('data');
 
-      if ($this.attr('aria-selected') === 'true') {
+      if ($this.attr('data-selected') === 'true') {
         if (self.options.get('multiple')) {
           self.trigger('unselect', {
             originalEvent: evt,
@@ -1213,12 +1248,13 @@ S2.define('select2/results',[
       });
     });
 
-    this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseenter', '.select2-results__option[data-selected]',
       function (evt) {
       var data = $(this).data('data');
 
       self.getHighlightedResults()
-          .removeClass('select2-results__option--highlighted');
+          .removeClass('select2-results__option--highlighted')
+          .attr('aria-selected', 'false');
 
       self.trigger('results:focus', {
         data: data,
@@ -1245,7 +1281,7 @@ S2.define('select2/results',[
       return;
     }
 
-    var $options = this.$results.find('[aria-selected]');
+    var $options = this.$results.find('[data-selected]');
 
     var currentIndex = $options.index($highlighted);
 
@@ -1323,7 +1359,7 @@ S2.define('select2/selection/base',[
 
   BaseSelection.prototype.render = function () {
     var $selection = $(
-      '<span class="select2-selection" role="combobox" ' +
+      '<span class="select2-selection" ' +
       ' aria-haspopup="true" aria-expanded="false">' +
       '</span>'
     );
@@ -1349,6 +1385,7 @@ S2.define('select2/selection/base',[
 
     var id = container.id + '-container';
     var resultsId = container.id + '-results';
+    var searchHidden = this.options.get('minimumResultsForSearch') === Infinity;
 
     this.container = container;
 
@@ -1390,7 +1427,11 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      // This needs to be delayed as the active element is the body when the
+      // key is pressed.
+      window.setTimeout(function () {
+        self.$selection.trigger( 'focus' );
+      }, 1);
 
       self._detachCloseHandler(container);
     });
@@ -1440,8 +1481,14 @@ S2.define('select2/selection/base',[
         }
 
         var $element = $this.data('element');
-
         $element.select2('close');
+
+        // Remove any focus when dropdown is closed by clicking outside the select area.
+        // Timeout of 1 required for close to finish wrapping up.
+        setTimeout(function(){
+         $this.find('*:focus').blur();
+         $target.focus();
+        }, 1);
       });
     });
   };
@@ -1500,8 +1547,21 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
-    this.$selection.attr('aria-labelledby', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
+
+    var label = this.options.get( 'label' );
+
+    if ( typeof( label ) === 'string' ) {
+      this.$selection.attr( 'aria-label', label );
+    } else {
+      this.$selection.attr( 'aria-labelledby', id );
+    }
+
+    // This makes single non-search selects work in screen readers. If it causes problems elsewhere, remove.
+    this.$selection.attr('role', 'combobox');
 
     this.$selection.on('mousedown', function (evt) {
       // Only respond to left clicks
@@ -1518,13 +1578,20 @@ S2.define('select2/selection/single',[
       // User focuses on the container
     });
 
+    this.$selection.on('keydown', function (evt) {
+      // If user starts typing an alphanumeric key on the keyboard, open if not opened.
+      if (!container.isOpen() && evt.which >= 48 && evt.which <= 90) {
+        container.open();
+      }
+    });
+
     this.$selection.on('blur', function (evt) {
       // User exits the container
     });
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1557,9 +1624,9 @@ S2.define('select2/selection/single',[
     var selection = data[0];
 
     var $rendered = this.$selection.find('.select2-selection__rendered');
-    var formatted = this.display(selection, $rendered);
+    var formatted = Utils.entityDecode(this.display(selection, $rendered));
 
-    $rendered.empty().append(formatted);
+    $rendered.empty().text(formatted);
     $rendered.prop('title', selection.title || selection.text);
   };
 
@@ -1583,7 +1650,7 @@ S2.define('select2/selection/multiple',[
     $selection.addClass('select2-selection--multiple');
 
     $selection.html(
-      '<ul class="select2-selection__rendered"></ul>'
+      '<ul class="select2-selection__rendered" aria-live="polite" aria-relevant="additions removals" aria-atomic="true"></ul>'
     );
 
     return $selection;
@@ -1620,6 +1687,18 @@ S2.define('select2/selection/multiple',[
         });
       }
     );
+
+    this.$selection.on('keydown', function (evt) {
+      // If user starts typing an alphanumeric key on the keyboard, open if not opened.
+      if (!container.isOpen() && evt.which >= 48 && evt.which <= 90) {
+        container.open();
+      }
+    });
+
+    // Focus on the search field when the container is focused instead of the main container.
+    container.on( 'focus', function(){
+      self.focusOnSearch();
+    });
   };
 
   MultipleSelection.prototype.clear = function () {
@@ -1636,7 +1715,7 @@ S2.define('select2/selection/multiple',[
   MultipleSelection.prototype.selectionContainer = function () {
     var $container = $(
       '<li class="select2-selection__choice">' +
-        '<span class="select2-selection__choice__remove" role="presentation">' +
+        '<span class="select2-selection__choice__remove" role="presentation" aria-hidden="true">' +
           '&times;' +
         '</span>' +
       '</li>'
@@ -1645,6 +1724,24 @@ S2.define('select2/selection/multiple',[
     return $container;
   };
 
+  /**
+   * Focus on the search field instead of the main multiselect container.
+   */
+  MultipleSelection.prototype.focusOnSearch = function() {
+    var self = this;
+
+    if ('undefined' !== typeof self.$search) {
+      // Needs 1 ms delay because of other 1 ms setTimeouts when rendering.
+      setTimeout(function(){
+        // Prevent the dropdown opening again when focused from this.
+        // This gets reset automatically when focus is triggered.
+        self._keyUpPrevented = true;
+
+        self.$search.focus();
+      }, 1);
+    }
+  }
+
   MultipleSelection.prototype.update = function (data) {
     this.clear();
 
@@ -1658,9 +1755,14 @@ S2.define('select2/selection/multiple',[
       var selection = data[d];
 
       var $selection = this.selectionContainer();
+      var removeItemTag = $selection.html();
       var formatted = this.display(selection, $selection);
+      if ('string' === typeof formatted) {
+        formatted = Utils.entityDecode(formatted.trim());
+      }
 
-      $selection.append(formatted);
+      $selection.text(formatted);
+      $selection.prepend(removeItemTag);
       $selection.prop('title', selection.title || selection.text);
 
       $selection.data('data', selection);
@@ -1699,7 +1801,7 @@ S2.define('select2/selection/placeholder',[
   Placeholder.prototype.createPlaceholder = function (decorated, placeholder) {
     var $placeholder = this.selectionContainer();
 
-    $placeholder.html(this.display(placeholder));
+    $placeholder.text(Utils.entityDecode(this.display(placeholder)));
     $placeholder.addClass('select2-selection__placeholder')
                 .removeClass('select2-selection__choice');
 
@@ -1836,8 +1938,8 @@ S2.define('select2/selection/search',[
   Search.prototype.render = function (decorated) {
     var $search = $(
       '<li class="select2-search select2-search--inline">' +
-        '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        '<input class="select2-search__field" type="text" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
         ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
       '</li>'
     );
@@ -1854,16 +1956,19 @@ S2.define('select2/selection/search',[
 
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
+    var resultsId = container.id + '-results';
 
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-owns', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
       self.$search.removeAttr('aria-activedescendant');
+      self.$search.removeAttr('aria-owns');
       self.$search.trigger('focus');
     });
 
@@ -1882,7 +1987,7 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      self.$search.attr('aria-activedescendant', params.data._resultId);
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1913,6 +2018,9 @@ S2.define('select2/selection/search',[
 
           evt.preventDefault();
         }
+      } else if (evt.which === KEYS.ENTER) {
+        container.open();
+        evt.preventDefault();
       }
     });
 
@@ -2001,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3004,8 +3112,15 @@ S2.define('select2/data/base',[
   };
 
   BaseAdapter.prototype.generateResultId = function (container, data) {
-    var id = container.id + '-result-';
+    var id = '';
 
+    if (container != null) {
+      id += container.id
+    } else {
+      id += Utils.generateChars(4);
+    }
+
+    id += '-result-';
     id += Utils.generateChars(4);
 
     if (data.id != null) {
@@ -3191,7 +3306,7 @@ S2.define('select2/data/select',[
       }
     }
 
-    if (data.id) {
+    if (data.id !== undefined) {
       option.value = data.id;
     }
 
@@ -3289,7 +3404,7 @@ S2.define('select2/data/select',[
       item.text = item.text.toString();
     }
 
-    if (item._resultId == null && item.id && this.container != null) {
+    if (item._resultId == null && item.id) {
       item._resultId = this.generateResultId(this.container, item);
     }
 
@@ -3432,7 +3547,7 @@ S2.define('select2/data/ajax',[
 
     if (this._request != null) {
       // JSONP requests cannot always be aborted
-      if ($.isFunction(this._request.abort)) {
+      if ( typeof this._request.abort === 'function' ) {
         this._request.abort();
       }
 
@@ -3457,7 +3572,7 @@ S2.define('select2/data/ajax',[
 
         if (self.options.get('debug') && window.console && console.error) {
           // Check to make sure that the response included a `results` key.
-          if (!results || !results.results || !$.isArray(results.results)) {
+          if (!results || !results.results || ! Array.isArray( results.results ) ) {
             console.error(
               'Select2: The AJAX results did not return an array in the ' +
               '`results` key of the response.'
@@ -3466,6 +3581,7 @@ S2.define('select2/data/ajax',[
         }
 
         callback(results);
+        self.container.focusOnActiveElement();
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
@@ -3515,7 +3631,7 @@ S2.define('select2/data/tags',[
 
     decorated.call(this, $element, options);
 
-    if ($.isArray(tags)) {
+    if ( Array.isArray( tags ) ) {
       for (var t = 0; t < tags.length; t++) {
         var tag = tags[t];
         var item = this._normalizeItem(tag);
@@ -3550,7 +3666,10 @@ S2.define('select2/data/tags',[
           }, true)
         );
 
-        var checkText = option.text === params.term;
+        var optionText = (option.text || '').toUpperCase();
+        var paramsTerm = (params.term || '').toUpperCase();
+
+        var checkText = optionText === paramsTerm;
 
         if (checkText || checkChildren) {
           if (child) {
@@ -3588,7 +3707,7 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype.createTag = function (decorated, params) {
-    var term = $.trim(params.term);
+    var term = params.term.trim();
 
     if (term === '') {
       return null;
@@ -3681,7 +3800,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger( 'focus' );
       }
 
       params.term = tokenData.term;
@@ -3887,9 +4006,9 @@ S2.define('select2/dropdown/search',[
 
     var $search = $(
       '<span class="select2-search select2-search--dropdown">' +
-        '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
-        ' spellcheck="false" role="textbox" />' +
+        '<input class="select2-search__field" type="text" tabindex="-1"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
+        ' spellcheck="false" role="combobox" aria-autocomplete="list" aria-expanded="true" />' +
       '</span>'
     );
 
@@ -3903,6 +4022,7 @@ S2.define('select2/dropdown/search',[
 
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
+    var resultsId = container.id + '-results';
 
     decorated.call(this, container, $container);
 
@@ -3926,23 +4046,24 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
-
-      self.$search.focus();
+      self.$search.attr('aria-owns', resultsId);
+      self.$search.trigger( 'focus' );
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
-
+      self.$search.removeAttr('aria-activedescendant');
+      self.$search.removeAttr('aria-owns');
       self.$search.val('');
     });
 
     container.on('focus', function () {
-      if (container.isOpen()) {
-        self.$search.focus();
+      if (!container.isOpen()) {
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -3957,6 +4078,10 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      self.$search.attr('aria-activedescendant', params.data._resultId);
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4098,7 +4223,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4753,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4816,7 +4941,7 @@ S2.define('select2/defaults',[
 
     function matcher (params, data) {
       // Always return the object if there is nothing to compare
-      if ($.trim(params.term) === '') {
+      if ( params.term.trim() === '' ) {
         return data;
       }
 
@@ -5344,16 +5469,22 @@ S2.define('select2/core',[
       });
     });
 
-    this.on('keypress', function (evt) {
-      var key = evt.which;
+    this.on('open', function(){
+      // Focus on the active element when opening dropdown.
+      // Needs 1 ms delay because of other 1 ms setTimeouts when rendering.
+      setTimeout(function(){
+        self.focusOnActiveElement();
+      }, 1);
+    });
 
+    $(document).on('keydown', function (evt) {
+      var key = evt.which;
       if (self.isOpen()) {
-        if (key === KEYS.ESC || key === KEYS.TAB ||
-            (key === KEYS.UP && evt.altKey)) {
+        if (key === KEYS.ESC || (key === KEYS.UP && evt.altKey)) {
           self.close();
 
           evt.preventDefault();
-        } else if (key === KEYS.ENTER) {
+        } else if (key === KEYS.ENTER || key === KEYS.TAB) {
           self.trigger('results:select', {});
 
           evt.preventDefault();
@@ -5370,17 +5501,42 @@ S2.define('select2/core',[
 
           evt.preventDefault();
         }
-      } else {
-        if (key === KEYS.ENTER || key === KEYS.SPACE ||
-            (key === KEYS.DOWN && evt.altKey)) {
-          self.open();
 
+        var $searchField = self.$dropdown.find('.select2-search__field');
+        if (! $searchField.length) {
+          $searchField = self.$container.find('.select2-search__field');
+        }
+
+        // Move the focus to the selected element on keyboard navigation.
+        // Required for screen readers to work properly.
+        if (key === KEYS.DOWN || key === KEYS.UP) {
+            self.focusOnActiveElement();
+        } else {
+          // Focus on the search if user starts typing.
+          $searchField.focus();
+          // Focus back to active selection when finished typing.
+          // Small delay so typed character can be read by screen reader.
+          setTimeout(function(){
+              self.focusOnActiveElement();
+          }, 1000);
+        }
+      } else if (self.hasFocus()) {
+        if (key === KEYS.ENTER || key === KEYS.SPACE ||
+            key === KEYS.DOWN) {
+          self.open();
           evt.preventDefault();
         }
       }
     });
   };
 
+  Select2.prototype.focusOnActiveElement = function () {
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (this.isOpen() && ! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
+  };
+
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
@@ -5568,7 +5724,7 @@ S2.define('select2/core',[
 
     var newVal = args[0];
 
-    if ($.isArray(newVal)) {
+    if ( Array.isArray( newVal ) ) {
       newVal = $.map(newVal, function (obj) {
         return obj.toString();
       });
@@ -5653,11 +5809,11 @@ S2.define('jquery.select2',[
   './select2/core',
   './select2/defaults'
 ], function ($, _, Select2, Defaults) {
-  if ($.fn.select2 == null) {
+  if ($.fn.selectWoo == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
 
-    $.fn.select2 = function (options) {
+    $.fn.selectWoo = function (options) {
       options = options || {};
 
       if (typeof options === 'object') {
@@ -5697,10 +5853,17 @@ S2.define('jquery.select2',[
     };
   }
 
-  if ($.fn.select2.defaults == null) {
-    $.fn.select2.defaults = Defaults;
+  if ($.fn.select2 != null && $.fn.select2.defaults != null) {
+    $.fn.selectWoo.defaults = $.fn.select2.defaults;
   }
 
+  if ($.fn.selectWoo.defaults == null) {
+    $.fn.selectWoo.defaults = Defaults;
+  }
+
+  // Also register selectWoo under select2 if select2 is not already present.
+  $.fn.select2 = $.fn.select2 || $.fn.selectWoo;
+
   return Select2;
 });
 
@@ -5719,6 +5882,7 @@ S2.define('jquery.select2',[
   // This allows Select2 to use the internal loader outside of this file, such
   // as in the language files.
   jQuery.fn.select2.amd = S2;
+  jQuery.fn.selectWoo.amd = S2;
 
   // Return the Select2 instance for anyone who is importing it.
   return select2;
diff --git a/assets/js/selectWoo/selectWoo.full.js b/assets/js/selectWoo/selectWoo.full.js
index e4e87e187c4..4c4daf83fc9 100644
--- a/assets/js/selectWoo/selectWoo.full.js
+++ b/assets/js/selectWoo/selectWoo.full.js
@@ -1,5 +1,5 @@
 /*!
- * SelectWoo 1.0.6
+ * SelectWoo 1.0.9
  * https://github.com/woocommerce/selectWoo
  *
  * Released under the MIT license
@@ -755,8 +755,8 @@ S2.define('select2/utils',[
     });
   };
 
-  Utils.entityDecode = function(html) {
-    var txt = document.createElement("textarea");
+  Utils.entityDecode = function (html) {
+    var txt = document.createElement('textarea');
     txt.innerHTML = html;
     return txt.value;
   }
@@ -1430,7 +1430,7 @@ S2.define('select2/selection/base',[
       // This needs to be delayed as the active element is the body when the
       // key is pressed.
       window.setTimeout(function () {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }, 1);
 
       self._detachCloseHandler(container);
@@ -1486,8 +1486,8 @@ S2.define('select2/selection/base',[
         // Remove any focus when dropdown is closed by clicking outside the select area.
         // Timeout of 1 required for close to finish wrapping up.
         setTimeout(function(){
-         $this.find('*:focus').blur();
-         $target.focus();
+         $this.find('*:focus').trigger( 'blur' );
+         $target.trigger( 'focus' );
         }, 1);
       });
     });
@@ -1551,7 +1551,14 @@ S2.define('select2/selection/single',[
       .attr('id', id)
       .attr('role', 'textbox')
       .attr('aria-readonly', 'true');
-    this.$selection.attr('aria-labelledby', id);
+
+    var label = this.options.get( 'label' );
+
+    if ( typeof( label ) === 'string' ) {
+      this.$selection.attr( 'aria-label', label );
+    } else {
+      this.$selection.attr( 'aria-labelledby', id );
+    }
 
     // This makes single non-search selects work in screen readers. If it causes problems elsewhere, remove.
     this.$selection.attr('role', 'combobox');
@@ -1584,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1730,7 +1737,7 @@ S2.define('select2/selection/multiple',[
         // This gets reset automatically when focus is triggered.
         self._keyUpPrevented = true;
 
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 1);
     }
   }
@@ -2102,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3540,7 +3547,7 @@ S2.define('select2/data/ajax',[
 
     if (this._request != null) {
       // JSONP requests cannot always be aborted
-      if ($.isFunction(this._request.abort)) {
+      if ('function' === typeof this._request.abort) {
         this._request.abort();
       }
 
@@ -3565,7 +3572,7 @@ S2.define('select2/data/ajax',[
 
         if (self.options.get('debug') && window.console && console.error) {
           // Check to make sure that the response included a `results` key.
-          if (!results || !results.results || !$.isArray(results.results)) {
+          if (!results || !results.results || !Array.isArray(results.results)) {
             console.error(
               'Select2: The AJAX results did not return an array in the ' +
               '`results` key of the response.'
@@ -3624,7 +3631,7 @@ S2.define('select2/data/tags',[
 
     decorated.call(this, $element, options);
 
-    if ($.isArray(tags)) {
+    if (Array.isArray(tags)) {
       for (var t = 0; t < tags.length; t++) {
         var tag = tags[t];
         var item = this._normalizeItem(tag);
@@ -3700,7 +3707,7 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype.createTag = function (decorated, params) {
-    var term = $.trim(params.term);
+    var term = 'string' === typeof params.term ? params.term.trim() : '';
 
     if (term === '') {
       return null;
@@ -3793,7 +3800,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger( 'focus' );
       }
 
       params.term = tokenData.term;
@@ -4040,10 +4047,10 @@ S2.define('select2/dropdown/search',[
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
       self.$search.attr('aria-owns', resultsId);
-      self.$search.focus();
+      self.$search.trigger( 'focus' );
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 0);
     });
 
@@ -4056,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4398,6 +4405,7 @@ S2.define('select2/dropdown/attachBody',[
 
     var parentOffset = $offsetParent.offset();
 
+    css.top -= parentOffset.top;
     css.left -= parentOffset.left;
 
     if (!isCurrentlyAbove && !isCurrentlyBelow) {
@@ -4412,7 +4420,7 @@ S2.define('select2/dropdown/attachBody',[
 
     if (newDirection == 'above' ||
       (isCurrentlyAbove && newDirection !== 'below')) {
-      css.top = container.top - dropdown.height;
+      css.top = container.top - parentOffset.top - dropdown.height;
     }
 
     if (newDirection != null) {
@@ -4870,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if (Array.isArray(options.language)) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4933,7 +4941,7 @@ S2.define('select2/defaults',[
 
     function matcher (params, data) {
       // Always return the object if there is nothing to compare
-      if ($.trim(params.term) === '') {
+      if ( 'undefined' === typeof params.term || ( 'string' === typeof params.term && '' === params.term.trim() ) ) {
         return data;
       }
 
@@ -5505,7 +5513,7 @@ S2.define('select2/core',[
             self.focusOnActiveElement();
         } else {
           // Focus on the search if user starts typing.
-          $searchField.focus();
+          $searchField.trigger( 'focus' );
           // Focus back to active selection when finished typing.
           // Small delay so typed character can be read by screen reader.
           setTimeout(function(){
@@ -5525,7 +5533,7 @@ S2.define('select2/core',[
   Select2.prototype.focusOnActiveElement = function () {
     // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
     if (this.isOpen() && ! Utils.isTouchscreen()) {
-      this.$results.find('li.select2-results__option--highlighted').focus();
+      this.$results.find('li.select2-results__option--highlighted').trigger( 'focus' );
     }
   };
 
@@ -5716,7 +5724,7 @@ S2.define('select2/core',[
 
     var newVal = args[0];
 
-    if ($.isArray(newVal)) {
+    if (Array.isArray(newVal)) {
       newVal = $.map(newVal, function (obj) {
         return obj.toString();
       });
@@ -5793,7 +5801,7 @@ S2.define('select2/compat/utils',[
   function syncCssClasses ($dest, $src, adapter) {
     var classes, replacements = [], adapted;
 
-    classes = $.trim($dest.attr('class'));
+    classes = 'string' === typeof $dest.attr('class') ? $dest.attr('class').trim() : '';
 
     if (classes) {
       classes = '' + classes; // for IE which returns object
@@ -5806,7 +5814,7 @@ S2.define('select2/compat/utils',[
       });
     }
 
-    classes = $.trim($src.attr('class'));
+    classes = 'string' === typeof $src.attr('class') ? $src.attr('class').trim() : '';
 
     if (classes) {
       classes = '' + classes; // for IE which returns object
@@ -5847,7 +5855,7 @@ S2.define('select2/compat/containerCss',[
 
     var containerCssClass = this.options.get('containerCssClass') || '';
 
-    if ($.isFunction(containerCssClass)) {
+    if ('function' === typeof containerCssClass) {
       containerCssClass = containerCssClass(this.$element);
     }
 
@@ -5873,7 +5881,7 @@ S2.define('select2/compat/containerCss',[
 
     var containerCss = this.options.get('containerCss') || {};
 
-    if ($.isFunction(containerCss)) {
+    if ('function' === typeof containerCss) {
       containerCss = containerCss(this.$element);
     }
 
@@ -5904,7 +5912,7 @@ S2.define('select2/compat/dropdownCss',[
 
     var dropdownCssClass = this.options.get('dropdownCssClass') || '';
 
-    if ($.isFunction(dropdownCssClass)) {
+    if ('function' === typeof dropdownCssClass) {
       dropdownCssClass = dropdownCssClass(this.$element);
     }
 
@@ -5930,7 +5938,7 @@ S2.define('select2/compat/dropdownCss',[
 
     var dropdownCss = this.options.get('dropdownCss') || {};
 
-    if ($.isFunction(dropdownCss)) {
+    if ('function' === typeof dropdownCss) {
       dropdownCss = dropdownCss(this.$element);
     }
 
@@ -5977,7 +5985,7 @@ S2.define('select2/compat/initSelection',[
     this.initSelection.call(null, this.$element, function (data) {
       self._isInitialized = true;
 
-      if (!$.isArray(data)) {
+      if (!Array.isArray(data)) {
         data = [data];
       }
 
@@ -6123,7 +6131,7 @@ S2.define('select2/compat/matcher',[
     function wrappedMatcher (params, data) {
       var match = $.extend(true, {}, data);
 
-      if (params.term == null || $.trim(params.term) === '') {
+      if ( params.term == null || ( 'string' === typeof params.term && '' === params.term.trim() ) ) {
         return match;
       }
 
@@ -6366,11 +6374,11 @@ S2.define('select2/selection/stopPropagation',[
 
     $.fn.extend({
         mousewheel: function(fn) {
-            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+            return fn ? this.on('mousewheel', fn) : this.trigger('mousewheel');
         },
 
         unmousewheel: function(fn) {
-            return this.unbind('mousewheel', fn);
+            return this.off('mousewheel', fn);
         }
     });
 
diff --git a/assets/js/selectWoo/selectWoo.js b/assets/js/selectWoo/selectWoo.js
index f4dc2bda2ca..1e894251667 100644
--- a/assets/js/selectWoo/selectWoo.js
+++ b/assets/js/selectWoo/selectWoo.js
@@ -1,5 +1,5 @@
 /*!
- * SelectWoo 1.0.6
+ * SelectWoo 1.0.9
  * https://github.com/woocommerce/selectWoo
  *
  * Released under the MIT license
@@ -755,8 +755,8 @@ S2.define('select2/utils',[
     });
   };
 
-  Utils.entityDecode = function(html) {
-    var txt = document.createElement("textarea");
+  Utils.entityDecode = function (html) {
+    var txt = document.createElement('textarea');
     txt.innerHTML = html;
     return txt.value;
   }
@@ -1430,7 +1430,7 @@ S2.define('select2/selection/base',[
       // This needs to be delayed as the active element is the body when the
       // key is pressed.
       window.setTimeout(function () {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }, 1);
 
       self._detachCloseHandler(container);
@@ -1486,8 +1486,8 @@ S2.define('select2/selection/base',[
         // Remove any focus when dropdown is closed by clicking outside the select area.
         // Timeout of 1 required for close to finish wrapping up.
         setTimeout(function(){
-         $this.find('*:focus').blur();
-         $target.focus();
+         $this.find('*:focus').trigger( 'blur' );
+         $target.trigger( 'focus' );
         }, 1);
       });
     });
@@ -1551,7 +1551,14 @@ S2.define('select2/selection/single',[
       .attr('id', id)
       .attr('role', 'textbox')
       .attr('aria-readonly', 'true');
-    this.$selection.attr('aria-labelledby', id);
+
+    var label = this.options.get( 'label' );
+
+    if ( typeof( label ) === 'string' ) {
+      this.$selection.attr( 'aria-label', label );
+    } else {
+      this.$selection.attr( 'aria-labelledby', id );
+    }
 
     // This makes single non-search selects work in screen readers. If it causes problems elsewhere, remove.
     this.$selection.attr('role', 'combobox');
@@ -1584,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1730,7 +1737,7 @@ S2.define('select2/selection/multiple',[
         // This gets reset automatically when focus is triggered.
         self._keyUpPrevented = true;
 
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 1);
     }
   }
@@ -2102,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3540,7 +3547,7 @@ S2.define('select2/data/ajax',[
 
     if (this._request != null) {
       // JSONP requests cannot always be aborted
-      if ($.isFunction(this._request.abort)) {
+      if ( typeof this._request.abort === 'function' ) {
         this._request.abort();
       }
 
@@ -3565,7 +3572,7 @@ S2.define('select2/data/ajax',[
 
         if (self.options.get('debug') && window.console && console.error) {
           // Check to make sure that the response included a `results` key.
-          if (!results || !results.results || !$.isArray(results.results)) {
+          if (!results || !results.results || ! Array.isArray( results.results ) ) {
             console.error(
               'Select2: The AJAX results did not return an array in the ' +
               '`results` key of the response.'
@@ -3624,7 +3631,7 @@ S2.define('select2/data/tags',[
 
     decorated.call(this, $element, options);
 
-    if ($.isArray(tags)) {
+    if ( Array.isArray( tags ) ) {
       for (var t = 0; t < tags.length; t++) {
         var tag = tags[t];
         var item = this._normalizeItem(tag);
@@ -3700,7 +3707,7 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype.createTag = function (decorated, params) {
-    var term = $.trim(params.term);
+    var term = params.term.trim();
 
     if (term === '') {
       return null;
@@ -3793,7 +3800,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger( 'focus' );
       }
 
       params.term = tokenData.term;
@@ -4040,10 +4047,10 @@ S2.define('select2/dropdown/search',[
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
       self.$search.attr('aria-owns', resultsId);
-      self.$search.focus();
+      self.$search.trigger( 'focus' );
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }, 0);
     });
 
@@ -4056,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4871,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4934,7 +4941,7 @@ S2.define('select2/defaults',[
 
     function matcher (params, data) {
       // Always return the object if there is nothing to compare
-      if ($.trim(params.term) === '') {
+      if ( params.term.trim() === '' ) {
         return data;
       }
 
@@ -5506,7 +5513,7 @@ S2.define('select2/core',[
             self.focusOnActiveElement();
         } else {
           // Focus on the search if user starts typing.
-          $searchField.focus();
+          $searchField.trigger( 'focus' );
           // Focus back to active selection when finished typing.
           // Small delay so typed character can be read by screen reader.
           setTimeout(function(){
@@ -5526,7 +5533,7 @@ S2.define('select2/core',[
   Select2.prototype.focusOnActiveElement = function () {
     // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
     if (this.isOpen() && ! Utils.isTouchscreen()) {
-      this.$results.find('li.select2-results__option--highlighted').focus();
+      this.$results.find('li.select2-results__option--highlighted').trigger( 'focus' );
     }
   };
 
@@ -5717,7 +5724,7 @@ S2.define('select2/core',[
 
     var newVal = args[0];
 
-    if ($.isArray(newVal)) {
+    if ( Array.isArray( newVal ) ) {
       newVal = $.map(newVal, function (obj) {
         return obj.toString();
       });
diff --git a/assets/js/stupidtable/stupidtable.js b/assets/js/stupidtable/stupidtable.js
index 017a9fd543b..063f7c8cfb5 100644
--- a/assets/js/stupidtable/stupidtable.js
+++ b/assets/js/stupidtable/stupidtable.js
@@ -32,9 +32,9 @@
         th_index = th_index - 1;
 
         // Determine (and/or reverse) sorting direction, default `asc`
-        var sort_dir = $this.data("sort-default") || dir.ASC;
-        if ($this.data("sort-dir"))
-           sort_dir = $this.data("sort-dir") === dir.ASC ? dir.DESC : dir.ASC;
+        var sort_dir = $this.data("sortDefault") || dir.ASC;
+        if ($this.data("sortDir"))
+           sort_dir = $this.data("sortDir") === dir.ASC ? dir.DESC : dir.ASC;
 
         // Choose appropriate sorting function.
         var type = $this.data("sort") || null;
@@ -65,7 +65,7 @@
               // with the TR itself into a tuple
               trs.each(function(index,tr) {
                 var $e = $(tr).children().eq(th_index);
-                var sort_val = $e.data("sort-value");
+                var sort_val = $e.data("sortValue");
                 var order_by = typeof(sort_val) !== "undefined" ? sort_val : $e.text();
                 column.push([order_by, tr]);
               });
@@ -83,8 +83,8 @@
           });
 
           // Reset siblings
-          $table.find("th").data("sort-dir", null).removeClass("sorting-desc sorting-asc");
-          $this.data("sort-dir", sort_dir).addClass("sorting-"+sort_dir);
+          $table.find("th").data("sortDir", null).removeClass("sorting-desc sorting-asc");
+          $this.data("sortDir", sort_dir).addClass("sorting-"+sort_dir);
 
           // Trigger `aftertablesort` event. Similar to `beforetablesort`
           $table.trigger("aftertablesort", {column: $this.index(), direction: sort_dir});
diff --git a/assets/js/zeroclipboard/jquery.zeroclipboard.js b/assets/js/zeroclipboard/jquery.zeroclipboard.js
index a8f1a1e7f21..5f64fe299df 100644
--- a/assets/js/zeroclipboard/jquery.zeroclipboard.js
+++ b/assets/js/zeroclipboard/jquery.zeroclipboard.js
@@ -1,7 +1,7 @@
 /*!
  * jquery.zeroclipboard
  * Bind to the `beforecopy`, `copy`, `aftercopy`, and `copy-error` events, custom DOM-like events for clipboard injection generated using jQuery's Special Events API and ZeroClipboard's Core module.
- * Copyright (c) 2014 
+ * Copyright (c) 2014
  * Licensed MIT
  * https://github.com/zeroclipboard/jquery.zeroclipboard
  * v0.2.0
@@ -1878,4 +1878,4 @@
   }
 })(jQuery, function() {
   return this || window;
-}());
\ No newline at end of file
+}());
diff --git a/assets/js/zoom/jquery.zoom.js b/assets/js/zoom/jquery.zoom.js
index d9cf35361e7..45ddbce029a 100755
--- a/assets/js/zoom/jquery.zoom.js
+++ b/assets/js/zoom/jquery.zoom.js
@@ -125,12 +125,12 @@
 					// Skip the fade-in for IE8 and lower since it chokes on fading-in
 					// and changing position based on mousemovement at the same time.
 					$img.stop()
-					.fadeTo($.support.opacity ? settings.duration : 0, 1, $.isFunction(settings.onZoomIn) ? settings.onZoomIn.call(img) : false);
+					.fadeTo($.support.opacity ? settings.duration : 0, 1, 'function' === typeof settings.onZoomIn ? settings.onZoomIn.call(img) : false);
 				}
 
 				function stop() {
 					$img.stop()
-					.fadeTo(settings.duration, 0, $.isFunction(settings.onZoomOut) ? settings.onZoomOut.call(img) : false);
+					.fadeTo(settings.duration, 0, 'function' === typeof settings.onZoomOut ? settings.onZoomOut.call(img) : false);
 				}
 
 				// Mouse events
@@ -221,8 +221,8 @@
 							}
 						});
 				}
-				
-				if ($.isFunction(settings.callback)) {
+
+				if ('function' === typeof settings.callback) {
 					settings.callback.call(img);
 				}
 			};
diff --git a/bin/composer/mozart/composer.lock b/bin/composer/mozart/composer.lock
index 1a6fcb7090b..81ac1cea0fc 100644
--- a/bin/composer/mozart/composer.lock
+++ b/bin/composer/mozart/composer.lock
@@ -33,6 +33,7 @@
                 "squizlabs/php_codesniffer": "^3.5",
                 "vimeo/psalm": "^4.4"
             },
+            "default-branch": true,
             "bin": [
                 "bin/mozart"
             ],
@@ -53,6 +54,10 @@
                 }
             ],
             "description": "Composes all dependencies as a package inside a WordPress plugin",
+            "support": {
+                "issues": "https://github.com/coenjacobs/mozart/issues",
+                "source": "https://github.com/coenjacobs/mozart/tree/master"
+            },
             "funding": [
                 {
                     "url": "https://github.com/coenjacobs",
@@ -144,6 +149,10 @@
                 "sftp",
                 "storage"
             ],
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem/issues",
+                "source": "https://github.com/thephpleague/flysystem/tree/1.x"
+            },
             "funding": [
                 {
                     "url": "https://offset.earth/frankdejonge",
@@ -192,6 +201,10 @@
                 }
             ],
             "description": "Mime-type detection for Flysystem",
+            "support": {
+                "issues": "https://github.com/thephpleague/mime-type-detection/issues",
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/frankdejonge",
@@ -246,20 +259,24 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
             "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556"
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
-                "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
+                "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
                 "shasum": ""
             },
             "require": {
@@ -326,6 +343,9 @@
                 "console",
                 "terminal"
             ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v5.2.8"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -340,20 +360,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-23T10:08:49+00:00"
+            "time": "2021-05-11T15:45:21+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
                 "shasum": ""
             },
             "require": {
@@ -384,6 +404,9 @@
             ],
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.2.8"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -398,7 +421,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2021-05-10T14:39:23+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -460,6 +483,9 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -538,6 +564,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -619,6 +648,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -696,6 +728,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -772,6 +807,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -852,6 +890,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -870,21 +911,21 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.2.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
-                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.0"
+                "psr/container": "^1.1"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -892,7 +933,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -928,6 +969,9 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -942,20 +986,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-07T11:33:47+00:00"
+            "time": "2021-04-01T10:43:52+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4e78d7d47061fa183639927ec40d607973699609"
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4e78d7d47061fa183639927ec40d607973699609",
-                "reference": "4e78d7d47061fa183639927ec40d607973699609",
+                "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
                 "shasum": ""
             },
             "require": {
@@ -1008,6 +1052,9 @@
                 "utf-8",
                 "utf8"
             ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.2.8"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1022,7 +1069,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-16T10:20:28+00:00"
+            "time": "2021-05-10T14:56:10+00:00"
         }
     ],
     "aliases": [],
@@ -1037,5 +1084,5 @@
     "platform-overrides": {
         "php": "7.3"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/bin/composer/phpcs/composer.lock b/bin/composer/phpcs/composer.lock
index 10aedae9334..e0653d55467 100644
--- a/bin/composer/phpcs/composer.lock
+++ b/bin/composer/phpcs/composer.lock
@@ -71,6 +71,10 @@
                 "stylecheck",
                 "tests"
             ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
             "time": "2020-06-25T14:57:39+00:00"
         },
         {
@@ -129,6 +133,10 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
             "time": "2019-12-27T09:44:58+00:00"
         },
         {
@@ -181,6 +189,10 @@
                 "polyfill",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie"
+            },
             "time": "2021-02-15T10:24:51+00:00"
         },
         {
@@ -231,20 +243,24 @@
                 "standards",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
+            },
             "time": "2019-08-28T14:22:28+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.8",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
                 "shasum": ""
             },
             "require": {
@@ -282,7 +298,12 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2020-10-23T02:01:07+00:00"
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2021-04-09T00:54:41+00:00"
         },
         {
             "name": "woocommerce/woocommerce-sniffs",
@@ -322,6 +343,10 @@
                 "woocommerce",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/woocommerce/woocommerce-sniffs/issues",
+                "source": "https://github.com/woocommerce/woocommerce-sniffs/tree/master"
+            },
             "time": "2020-08-06T18:23:45+00:00"
         },
         {
@@ -368,6 +393,11 @@
                 "standards",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues",
+                "source": "https://github.com/WordPress/WordPress-Coding-Standards",
+                "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
+            },
             "time": "2020-05-13T23:57:56+00:00"
         }
     ],
@@ -381,5 +411,5 @@
     "platform-overrides": {
         "php": "7.0"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/bin/composer/phpunit/composer.lock b/bin/composer/phpunit/composer.lock
index efc67dcf121..b32d4d77b22 100644
--- a/bin/composer/phpunit/composer.lock
+++ b/bin/composer/phpunit/composer.lock
@@ -59,6 +59,10 @@
                 "constructor",
                 "instantiate"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/master"
+            },
             "time": "2015-06-14T21:17:01+00:00"
         },
         {
@@ -104,6 +108,10 @@
                 "object",
                 "object graph"
             ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
+            },
             "time": "2017-10-19T19:58:43+00:00"
         },
         {
@@ -159,6 +167,10 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
             "time": "2017-03-05T18:14:27+00:00"
         },
         {
@@ -206,6 +218,10 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/master"
+            },
             "time": "2017-03-05T17:38:23+00:00"
         },
         {
@@ -260,6 +276,10 @@
                 "reflection",
                 "static analysis"
             ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master"
+            },
             "time": "2017-09-11T18:02:19+00:00"
         },
         {
@@ -312,6 +332,10 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x"
+            },
             "time": "2019-12-28T18:55:12+00:00"
         },
         {
@@ -357,6 +381,10 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/master"
+            },
             "time": "2017-12-30T13:23:38+00:00"
         },
         {
@@ -420,6 +448,10 @@
                 "spy",
                 "stub"
             ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+            },
             "time": "2020-03-05T15:02:03+00:00"
         },
         {
@@ -483,6 +515,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3"
+            },
             "time": "2018-04-06T15:36:58+00:00"
         },
         {
@@ -530,6 +566,11 @@
                 "filesystem",
                 "iterator"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+            },
             "time": "2017-11-27T13:52:08+00:00"
         },
         {
@@ -571,6 +612,10 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -620,6 +665,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -669,6 +718,10 @@
             "keywords": [
                 "tokenizer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+            },
             "abandoned": true,
             "time": "2017-11-27T05:48:46+00:00"
         },
@@ -754,6 +807,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14"
+            },
             "time": "2019-02-01T05:22:47+00:00"
         },
         {
@@ -813,6 +870,10 @@
                 "mock",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10"
+            },
             "abandoned": true,
             "time": "2018-08-09T05:50:03+00:00"
         },
@@ -859,6 +920,10 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -929,6 +994,10 @@
                 "compare",
                 "equality"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/master"
+            },
             "time": "2018-02-01T13:46:46+00:00"
         },
         {
@@ -981,6 +1050,10 @@
             "keywords": [
                 "diff"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/master"
+            },
             "time": "2017-08-03T08:09:46+00:00"
         },
         {
@@ -1031,6 +1104,10 @@
                 "environment",
                 "hhvm"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/master"
+            },
             "time": "2017-07-01T08:51:00+00:00"
         },
         {
@@ -1098,6 +1175,10 @@
                 "export",
                 "exporter"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1155,6 +1236,10 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+            },
             "time": "2017-04-27T15:39:26+00:00"
         },
         {
@@ -1202,6 +1287,10 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1253,6 +1342,10 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1312,6 +1405,10 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1360,6 +1457,10 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/master"
+            },
             "time": "2015-07-28T20:34:47+00:00"
         },
         {
@@ -1403,6 +1504,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -1465,6 +1570,9 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1519,6 +1627,10 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
             "time": "2019-06-13T22:48:21+00:00"
         },
         {
@@ -1568,6 +1680,10 @@
                 "check",
                 "validate"
             ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+            },
             "time": "2020-07-08T17:02:28+00:00"
         }
     ],
@@ -1581,5 +1697,5 @@
     "platform-overrides": {
         "php": "7.0"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/bin/composer/wp/composer.lock b/bin/composer/wp/composer.lock
index f0f61f98695..3532eb3520e 100644
--- a/bin/composer/wp/composer.lock
+++ b/bin/composer/wp/composer.lock
@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "gettext/gettext",
-            "version": "v4.8.3",
+            "version": "v4.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-gettext/Gettext.git",
-                "reference": "57ff4fb16647e78e80a5909fe3c190f1c3110321"
+                "reference": "58bc0f7f37e78efb0f9758f93d4a0f669f0f84a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/57ff4fb16647e78e80a5909fe3c190f1c3110321",
-                "reference": "57ff4fb16647e78e80a5909fe3c190f1c3110321",
+                "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/58bc0f7f37e78efb0f9758f93d4a0f669f0f84a1",
+                "reference": "58bc0f7f37e78efb0f9758f93d4a0f669f0f84a1",
                 "shasum": ""
             },
             "require": {
@@ -67,7 +67,26 @@
                 "po",
                 "translation"
             ],
-            "time": "2020-11-18T22:35:49+00:00"
+            "support": {
+                "email": "oom@oscarotero.com",
+                "issues": "https://github.com/oscarotero/Gettext/issues",
+                "source": "https://github.com/php-gettext/Gettext/tree/v4.8.4"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/oscarotero",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/oscarotero",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/misteroom",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2021-03-10T19:35:49+00:00"
         },
         {
             "name": "gettext/languages",
@@ -128,6 +147,10 @@
                 "translations",
                 "unicode"
             ],
+            "support": {
+                "issues": "https://github.com/php-gettext/Languages/issues",
+                "source": "https://github.com/php-gettext/Languages/tree/2.6.0"
+            },
             "time": "2019-11-13T10:30:21+00:00"
         },
         {
@@ -173,6 +196,10 @@
                 }
             ],
             "description": "Peast is PHP library that generates AST for JavaScript code",
+            "support": {
+                "issues": "https://github.com/mck89/peast/issues",
+                "source": "https://github.com/mck89/peast/tree/v1.12.0"
+            },
             "time": "2021-01-08T15:16:19+00:00"
         },
         {
@@ -219,27 +246,38 @@
                 "mustache",
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/bobthecow/mustache.php/issues",
+                "source": "https://github.com/bobthecow/mustache.php/tree/master"
+            },
             "time": "2019-11-23T21:40:31+00:00"
         },
         {
             "name": "rmccue/requests",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/rmccue/Requests.git",
-                "reference": "87932f52ffad70504d93f04f15690cf16a089546"
+                "url": "https://github.com/WordPress/Requests.git",
+                "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rmccue/Requests/zipball/87932f52ffad70504d93f04f15690cf16a089546",
-                "reference": "87932f52ffad70504d93f04f15690cf16a089546",
+                "url": "https://api.github.com/repos/WordPress/Requests/zipball/afbe4790e4def03581c4a0963a1e8aa01f6030f1",
+                "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2"
             },
             "require-dev": {
-                "requests/test-server": "dev-master"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "php-parallel-lint/php-console-highlighter": "^0.5.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5",
+                "requests/test-server": "dev-master",
+                "squizlabs/php_codesniffer": "^3.5",
+                "wp-coding-standards/wpcs": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -258,7 +296,7 @@
                 }
             ],
             "description": "A HTTP library written in PHP, for human beings.",
-            "homepage": "http://github.com/rmccue/Requests",
+            "homepage": "http://github.com/WordPress/Requests",
             "keywords": [
                 "curl",
                 "fsockopen",
@@ -268,7 +306,11 @@
                 "iri",
                 "sockets"
             ],
-            "time": "2016-10-13T00:11:37+00:00"
+            "support": {
+                "issues": "https://github.com/WordPress/Requests/issues",
+                "source": "https://github.com/WordPress/Requests/tree/v1.8.0"
+            },
+            "time": "2021-04-27T11:05:25+00:00"
         },
         {
             "name": "symfony/finder",
@@ -317,30 +359,33 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/3.3"
+            },
             "time": "2017-06-01T21:01:25+00:00"
         },
         {
             "name": "wp-cli/i18n-command",
-            "version": "v2.2.6",
+            "version": "v2.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/i18n-command.git",
-                "reference": "a66da3f09f6a728832381012848c3074bf1635c8"
+                "reference": "8bc234617edc533590ac0f41080164a8d85ec9ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/a66da3f09f6a728832381012848c3074bf1635c8",
-                "reference": "a66da3f09f6a728832381012848c3074bf1635c8",
+                "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/8bc234617edc533590ac0f41080164a8d85ec9ce",
+                "reference": "8bc234617edc533590ac0f41080164a8d85ec9ce",
                 "shasum": ""
             },
             "require": {
                 "gettext/gettext": "^4.8",
                 "mck89/peast": "^1.8",
-                "wp-cli/wp-cli": "^2"
+                "wp-cli/wp-cli": "^2.5"
             },
             "require-dev": {
                 "wp-cli/scaffold-command": "^1.2 || ^2",
-                "wp-cli/wp-cli-tests": "^2.1.3"
+                "wp-cli/wp-cli-tests": "^3.0.11"
             },
             "type": "wp-cli-package",
             "extra": {
@@ -374,7 +419,11 @@
             ],
             "description": "Provides internationalization tools for WordPress projects.",
             "homepage": "https://github.com/wp-cli/i18n-command",
-            "time": "2020-12-07T19:28:27+00:00"
+            "support": {
+                "issues": "https://github.com/wp-cli/i18n-command/issues",
+                "source": "https://github.com/wp-cli/i18n-command/tree/v2.2.8"
+            },
+            "time": "2021-05-10T10:24:16+00:00"
         },
         {
             "name": "wp-cli/mustangostang-spyc",
@@ -422,6 +471,9 @@
             ],
             "description": "A simple YAML loader/dumper class for PHP (WP-CLI fork)",
             "homepage": "https://github.com/mustangostang/spyc/",
+            "support": {
+                "source": "https://github.com/wp-cli/spyc/tree/autoload"
+            },
             "time": "2017-04-25T11:26:20+00:00"
         },
         {
@@ -472,27 +524,31 @@
                 "cli",
                 "console"
             ],
+            "support": {
+                "issues": "https://github.com/wp-cli/php-cli-tools/issues",
+                "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.12"
+            },
             "time": "2021-03-03T12:43:49+00:00"
         },
         {
             "name": "wp-cli/wp-cli",
-            "version": "v2.4.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/wp-cli.git",
-                "reference": "ceb18598e79befa9b2a37a51efbb34910628988b"
+                "reference": "4c4746d06640af7698f3792cc4c327a8482dc40f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/ceb18598e79befa9b2a37a51efbb34910628988b",
-                "reference": "ceb18598e79befa9b2a37a51efbb34910628988b",
+                "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/4c4746d06640af7698f3792cc4c327a8482dc40f",
+                "reference": "4c4746d06640af7698f3792cc4c327a8482dc40f",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "mustache/mustache": "~2.13",
-                "php": "^5.4 || ^7.0",
-                "rmccue/requests": "~1.6",
+                "php": "^5.6 || ^7.0 || ^8.0",
+                "rmccue/requests": "^1.8",
                 "symfony/finder": ">2.7",
                 "wp-cli/mustangostang-spyc": "^0.6.3",
                 "wp-cli/php-cli-tools": "~0.11.2"
@@ -503,12 +559,13 @@
                 "wp-cli/entity-command": "^1.2 || ^2",
                 "wp-cli/extension-command": "^1.1 || ^2",
                 "wp-cli/package-command": "^1 || ^2",
-                "wp-cli/wp-cli-tests": "^2.1"
+                "wp-cli/wp-cli-tests": "^3.0.7"
             },
             "suggest": {
                 "ext-readline": "Include for a better --prompt implementation",
                 "ext-zip": "Needed to support extraction of ZIP archives when doing downloads or updates"
             },
+            "default-branch": true,
             "bin": [
                 "bin/wp",
                 "bin/wp.bat"
@@ -516,13 +573,17 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4.x-dev"
+                    "dev-master": "2.5.x-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "WP_CLI": "php"
-                }
+                    "WP_CLI\\": "php/"
+                },
+                "classmap": [
+                    "php/class-wp-cli.php",
+                    "php/class-wp-cli-command.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -534,7 +595,12 @@
                 "cli",
                 "wordpress"
             ],
-            "time": "2020-02-18T08:15:37+00:00"
+            "support": {
+                "docs": "https://make.wordpress.org/cli/handbook/",
+                "issues": "https://github.com/wp-cli/wp-cli/issues",
+                "source": "https://github.com/wp-cli/wp-cli"
+            },
+            "time": "2021-05-13T09:36:33+00:00"
         }
     ],
     "aliases": [],
@@ -547,5 +613,5 @@
     "platform-overrides": {
         "php": "7.0"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/bin/contributors.sh b/bin/contributors.sh
index b057ec66d75..e25389fb6e2 100755
--- a/bin/contributors.sh
+++ b/bin/contributors.sh
@@ -3,7 +3,7 @@
 read -p 'What date (YYYY-MM-DD) should we get contributions since? (i.e. date of previous release): ' from_date
 read -sp 'Provide a personal access token (you must): ' auth_token
 
-ignored_users="renovate-bot,apps/renovate,renovate,renovate[bot],github-actions[bot]"
+ignored_users="renovate-bot,apps/renovate,renovate,renovate[bot],github-actions[bot],dependabot,dependabot[bot]"
 output_file="contributors.html"
 common_arguments="--owner woocommerce --fromDate $from_date --authToken $auth_token --cols 6 --sortBy contributions --format html --sortOrder desc --showlogin true --filter $ignored_users"
 
diff --git a/changelog.txt b/changelog.txt
index d2100ece059..dc87ea85f2e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,21 +1,156 @@
 == Changelog ==
 
-= 5.2.0 RC 2021-03-30 =
-
-* Update - WooCommerce Admin package 2.1.4. #29520
-* Fix - Don't remove existing coupons from order when an invalid REST API request for updating coupons is submitted. #29474
-* Fix - Wrong logic for including or excluding the payments step in the list of completed tasks in the onboarding wizard. #29518
-
-**WooCommerce Admin - 2.1.4**
-
-* Fix - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
-
-= 5.2.0 beta 2021-03-23 =
+= 5.3.0 2021-05-11 =
+
+**WooCommerce**
+
+* Dev - Add support for "cities" and "postcodes" fields to the REST API endpoints to create/update tax rates. #29495
+* Dev - The taxes GET endpoint now supports sorting by priority. #29495
+* Enhancement - Add a new `woocommerce_cart_product_not_enough_stock_already_in_cart_message` filter to allow developers to filter an add-to-cart error when there isn't enough in stock taking into account what's already in the cart. #29304
+* Enhancement - Pass `$handler`, and prevent logging from `woocommerce_logger_log_message` filter when the message is null. #29572
+* Fix - Added parameter `$item` (instance of WC_Order_Item) to both the function `wc_downloadable_file_permission` and the filter hook `woocommerce_downloadable_file_permission`. #23188
+* Fix - Add array-typed "cities" and "postcodes" to the response of the "tax" endpoint in the REST API to overcome the limitation of "city" and "postcode" returning always one single value. #27751
+* Fix - Update tax rate for existing taxes when recalculating order totals. #27985
+* Fix - Replace page setup dropdowns with AJAX powered search selects. #29181
+* Fix - Return 0 if order isn't available in `WC_Payment_Gateway::get_order_total()`. #29314
+* Fix - Fix console error on IE11 when opening admin pages. #29322
+* Fix - Prevent crash when log file can't be opened for writing. #29396
+* Fix - Closes the section "Store management insights" in email settings. #29447
+* Fix - Fixed return type of `WC_Shortcode_Products::get_type()`. #29452
+* Fix - Fix syntax error in the admin (products/orders) list table. #29469
+* Fix - Cart duplicate debug shipping notices in certain situations. #29480
+* Fix - Trying to update the cities or postcodes (only) or a tax rate via REST API returned an error. #29495
+* Fix - Unneeded browser popup message of unsaved changes when adding a shipping zone with a shipping method. #29510
+* Fix - Update the persistent cart after it's loaded on customer login. Fixes an issue whereby unavailable products would be validated on every login. #29517
+* Fix - Updated `$customer->get_shipping()` and `$customer->get_billing()` to return the full address after updating individual fields. #29538
+* Fix - Prevent cart to reset all nonce in front-end. #29542
+* Fix - Bump the version of the "Grouped product add to cart" template to 4.8.0 (was still at 4.0.0 by mistake). #29601
+* Fix - If we have a non-empty shipping address then do not overwrite the state or country fields with billing address data. #29605
+* Tweak - Add the support to `optgroups` in single select on Settings API. #29145
+* Tweak - Improves performance by avoiding an unnecessary redirect if custom permalink structure does not contain trailing slashes. #29422
+* Tweak - Update SSR db version tooltip to more accurately state the db version. #29438
+* Tweak - Adjust Twenty Twenty One order items header alignment. #29485
+* Tweak - Lost password form alignment issues. #29496
+* Tweak - Improve accessibility by adding `aria-hidden="true"` on strikethrough prices. #29603
+* Tweak - Default store location to US California. #29654
+* Tweak - Default store currency to USD. #29752
+
+** WooCommerce Blocks - 4.8.0 & 4.9.0 & 4.9.1 **
+
+* Dev - Removed legacy handling for SSR blocks that rendered shortcodes. #4010
+* Fix - Customer address country saving to orders in certain circumstances. #4013
+* Fix - Prevent error messages returned by the API from displaying raw HTML. #4005
+* Fix - Proceed to checkout button click bug happening when the Coupon error is visible in the Cart block. #3996
+* Fix - Use font color in payment methods border. #4051
+* Fix - Load translation file for JS files that has translatable strings. #4050
+* Fix - Stop shipping package titles line-breaks occurring in the middle of a word. #4049
+* Fix - Fixed styling issues on the cart and checkout page in Twenty(X) themes. #4046
+* Fix - Fix headline alignment in the empty state of the cart block. #4044
+* Fix - Fix button alignment in Featured Product and Featured Category blocks. #4028
+* Fix - Check if Cart and Checkout are registered before removing payment methods. #4056
+* Enhancement - Registered payment methods now have access to the `shouldSavePayment` prop in their components (which indicates whether the shopper has checked the save payment method checkbox. #3990
+* Enhancement - Payment methods implementing the `savedTokenComponent` configuration property will now have the `onPaymentProcessing` event available to the registered component. #3982
+
+** WooCommerce Admin - 2.2.0 & 2.2.1 & 2.2.2 & 2.2.3 & 2.2.4 & 2.2.5 & 2.2.6 **
+* Add - Next new novel navigation nudge note #6610
+* Add - Add legacy report items to new navigation #6507
+* Add - Add preview site button on the appearance task #6457
+* Add - Back button to go to home screen from tasks in the task list. #6397
+* Add - Add a "rather not say" option to revenue in the profile wizard. #6475
+* Add - Remove Mollie promo note on install #6510
+* Add - Remote Inbox Notifications rule to trigger when WooCommerce Admin is upgraded. #6040
+* Add - CES survey for search product, order, customer #6420
+* Add - CES survey for importing products #6419
+* Add - CES survey for adding product categories, tags, and attributes #6418
+* Add - Additional analytics tracking for the business details step. #6575
+* Add - Include tracking for mail poet installs in the selective bundle install #6603
+* Add - Paystack payment provider to several african countries. #6579
+* Dev - Close activity panel tabs by default and track #6566
+* Dev - Update undefined task name properties for help panel tracks #6565
+* Dev - Refactor profile wizard benefits step and add tests #6583
+* Dev - Add filter to profile wizard steps #6564
+* Dev - Add nav intro modal tests #6518
+* Dev - Use wc filter to get status tabs for tools category #6525
+* Dev - Add nav header component tests #6509
+* Dev - Add initial tests for navigation Menu class #6492
+* Dev - Remove active item from navigation store #6486
+* Dev - Add navigation container tests #6464
+* Dev - Add nav favorite button tests #6446
+* Dev - Add a changelog lint check to PRs. #6414
+* Dev - Add navigation favorites tests #6409
+* Dev - support use of Array.flat in client and packages. #6411
+* Dev - Deprecate Onboarding::has_woocommerce_support. #6401
+* Dev - Add Dependency Extraction Webpack Plugin #5762
+* Dev - Add client-side filter for Navigation rootBackUrl #6505
+* Dev - Remove `items_purchased` and `account_type` props from onboarding profile API. #6520
+* Dev - Added warning when WC-Admin is active but not being used #6453
+* Dev - Store profiler - Added MailPoet to Business Details step  #6503
+* Dev - Store profiler - Added MailPoet to new Business Details step  #6515
+* Dev - Add tilde (~) to represent client root directory for imports. #6517
+* Dev - Add script automation for gathering hooks and filters. #6454
+* Dev - Add TypeScript and page objects to the E2E test suite. #6582
+* Dev - Introduce Typescript to Navigation utils #6477
+* Dev - Payments task: include Mercado Pago #6572
+* Dev - Ensure script asset.php files are included in builds #6635
+* Dev - Ensure production script asset names don't include .min suffix #6681
+* Dev - Do a git clean before the core release. #6945
+* Dev - Fix a bug where trying to load an asset registry causes a crash. #6951
+* Fix - Add check for navigating being enabled. #6462
+* Fix - Move the shipping input and text 1px lower. #6408
+* Fix - Correct the Klarna slug #6440
+* Fix - Broken link anchors to online documentation. #6455
+* Fix - Update payment card style on mobile #6413
+* Fix - Missing i18n in Welcome modal. #6456
+* Fix - Restore visual styles back to Analytics tabs. #5913
+* Fix - Update contrast and hover / active colors for analytics dropdown buttons #6504
+* Fix - Associated Order Number for refunds was hidden #6428
+* Fix - Fix issue where Loader::is_admin_page() would error if WooCommerce admin is disabled. #6563
+* Fix - Correct a bug where the JP connection flow would not happen when installing JP in the OBW. #6521
+* Fix - Show management links when the task list is complete (even if its not hidden). #6657
+* Fix - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
+* Fix - Update the Mercado option used for enabling/disabling. #6677
+* Fix - Improve AddFirstProduct email note contents. #6617
+* Fix - Check if features are currently being enabled #6688
+* Fix - Fix the activity panel toggle not closing on click #6679
+* Fix - Fix use of feature checks and remove deprecated method calls #6687
+* Fix - Allow the manager role to query certain options #6577
+* Fix - Delete customer data on network user deletion #6574
+* Fix - Fix Themes step visibility in IE 11 #6578
+* Fix - Fix hidden menu title on smaller screens #6562
+* Fix - Add gross sales column to CSV export #6567
+* Fix - Disable the continue btn on OBW when requested are being made #6838
+* Fix - Calling of get_script_asset_filename with extra parameter #6955
+* Fix - Address an issue with OBW when installing only WooCommerce payments and Jetpack. #6957
+* Tweak - Add default value for contains op #6622
+* Tweak - Adjust targeting store age for the Add First Product note #6554
+* Tweak - Improve WC Shipping & Tax logic #6547
+* Tweak - Update Insight inbox note content #6555
+* Tweak - Remove mobile activity panel toggle #6539
+* Tweak - Refactor autoloader to remove global variable. #6412
+* Tweak - Revert WCPay international support for bundled package #6901
+* Tweak - Store profiler - Changed MailPoet's title and description #6886
+* Tweak - Update PayU logo #6829
+
+= 5.2.2 2021-04-15 =
+
+**WooCommerce**
+
+* Fix - Can't grant permission for download from order details page. #29691
+
+= 5.2.1 2021-04-14 =
+
+**WooCommerce**
+
+* Update - WooCommerce Blocks package 4.7.2. #29660
+
+**WooCommerce Blocks - 4.7.2**
+
+* Fix - Check if Cart and Checkout are registered before removing payment methods. ([4056](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/4056))
+
+= 5.2.0 2021-04-13 =
 
 **WooCommerce**
 
-* Update - WooCommerce Blocks package 4.7.0. #29406
-* Update - WooCommerce Admin package 2.1.3. #29283
 * Add - Filter woocommerce_product_recount_terms to allow/prevent recounting of product terms. #29281
 * Add - Result return array to the checkout_place_order_success callback to allow 3rd party to manipulate results. #29232
 * Dev - Fix miscellaneous typos in docblocks. #29285
@@ -54,11 +189,21 @@
 * Fix - Invalid refund amount error on $0 refund when number of decimals is equal to 0. #27277
 * Fix - "Sale" badge misaligned on products when displaying 1 item per row. #29425
 * Fix - Revert a replacement of wp_redirect to wp_safe_redirect in WC_Checkout::process_order_payment that caused issues in the default PayPal interface. #29459
+* Fix - Don't remove existing coupons from order when an invalid REST API request for updating coupons is submitted. #29474
+* Fix - Wrong logic for including or excluding the payments step in the list of completed tasks in the onboarding wizard. #29518
+* Fix - Error when loading the admin dashboard while the admin package was disabled. #29613
+* Fix - "'' is not a valid country code" error when no billing/shipping country specified (e.g. when using PayPal checkout). #29606
+* Fix - Sanitize tax class and display errors in admin while creating tax classes.
+* Fix - Check if a verified product owner is required before placing a review.
+* Fix - Make product name escaping consistent in the front-end.
 * Tweak - Added the Mercado Pago logo into the assets/images folder in order to use it in the payments setup task. #29365
 * Tweak - Update the contributor guidelines. #29150
 * Tweak - Introduced phone number input validation. #27242
+* Tweak - Escape short description.
+* Update - WooCommerce Admin package 2.1.5. #29577
+* Update - WooCommerce Blocks package 4.7.0. #29406
 
-**WooCommerce Admin - 2.1.0 & 2.1.1 & 2.1.2 & 2.1.3**
+**WooCommerce Admin - 2.1.0 & 2.1.1 & 2.1.2 & 2.1.3 & 2.1.4 & 2.1.5**
 
 * Add - Add navigation intro modal. #6367
 * Add - CES track settings tab on updating settings #6368
@@ -85,6 +230,7 @@
 * Fix - Add check for navigating being enabled. #6462
 * Fix - Add customer name column to CSV export #6556
 * Fix - Add guard to "Deactivate Plugin" note handlers to prevent fatal error. #6532
+* Fix - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
 * Fix - Broken link anchors to online documentation. #6455
 * Fix - Check if tax was successfully added before displaying notice #6229
 * Fix - Correct a bug where the JP connection flow would not happen when installing JP in the OBW. #6521
@@ -108,11 +254,12 @@
 * Tweak - New Settings: Turn off in dev mode #6348
 * Tweak - Order and styles updates to nav footer #6373
 * Tweak - Remove categories without menu items #6329
+* Tweak - Set international country feature flag off
 * Tweak - Set `is_deleted` from the database when instantiating a `Note` #6322
 * Tweak - Update inline documentation for navigation Screen class #6173
 * Tweak - Updates to copy and punctuation to be more conversational and consistent. #6298
 
-**WooCommerce Blocks - 4.5.0 & 4.6.0 & 4.7.0**
+**WooCommerce Blocks - 4.5.0 & 4.6.0 & 4.7.0 & 4.7.1**
 
 * Enhancement - Login links on the checkout should use the account page. ([3844](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3844))
 * Enhancement - Prevent checkout linking to trashed terms and policy pages. ([3843](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3843))
diff --git a/composer.json b/composer.json
index 385182966bc..34a1dc6a246 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
     "pelago/emogrifier": "3.1.0",
     "psr/container": "1.0.0",
     "woocommerce/action-scheduler": "3.1.6",
-    "woocommerce/woocommerce-admin": "2.1.4",
-    "woocommerce/woocommerce-blocks": "4.7.0"
+    "woocommerce/woocommerce-admin": "2.3.0",
+    "woocommerce/woocommerce-blocks": "5.1.0"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.4"
diff --git a/composer.lock b/composer.lock
index 2eb76ff282e..966a06ec993 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b1d6d94c8cfae572ab27c288c6865787",
+    "content-hash": "ac338dadb8929c73ad9606426621f9ba",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -92,16 +92,16 @@
         },
         {
             "name": "composer/installers",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d"
+                "reference": "ae03311f45dfe194412081526be2e003960df74b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d",
-                "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d",
+                "url": "https://api.github.com/repos/composer/installers/zipball/ae03311f45dfe194412081526be2e003960df74b",
+                "reference": "ae03311f45dfe194412081526be2e003960df74b",
                 "shasum": ""
             },
             "require": {
@@ -195,6 +195,7 @@
                 "majima",
                 "mako",
                 "mediawiki",
+                "miaoxing",
                 "modulework",
                 "modx",
                 "moodle",
@@ -212,6 +213,7 @@
                 "sydes",
                 "sylius",
                 "symfony",
+                "tastyigniter",
                 "typo3",
                 "wordpress",
                 "yawik",
@@ -220,7 +222,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/installers/issues",
-                "source": "https://github.com/composer/installers/tree/v1.10.0"
+                "source": "https://github.com/composer/installers/tree/v1.11.0"
             },
             "funding": [
                 {
@@ -236,7 +238,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-14T11:07:16+00:00"
+            "time": "2021-04-28T06:42:17+00:00"
         },
         {
             "name": "maxmind-db/reader",
@@ -530,16 +532,16 @@
         },
         {
             "name": "woocommerce/woocommerce-admin",
-            "version": "2.1.4",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-admin.git",
-                "reference": "f992b8c8664e72b00ee7283ba1d34e74e4b67ab0"
+                "reference": "c690969d301ddb7145b43e72e4dd99c84cc8ba66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/f992b8c8664e72b00ee7283ba1d34e74e4b67ab0",
-                "reference": "f992b8c8664e72b00ee7283ba1d34e74e4b67ab0",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/c690969d301ddb7145b43e72e4dd99c84cc8ba66",
+                "reference": "c690969d301ddb7145b43e72e4dd99c84cc8ba66",
                 "shasum": ""
             },
             "require": {
@@ -548,7 +550,7 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "7.5.20",
+                "bamarni/composer-bin-plugin": "^1.4",
                 "suin/phpcs-psr4-sniff": "^2.2",
                 "woocommerce/woocommerce-sniffs": "0.1.0"
             },
@@ -558,6 +560,9 @@
                     "test": "Run unit tests",
                     "phpcs": "Analyze code against the WordPress coding standards with PHP_CodeSniffer",
                     "phpcbf": "Fix coding standards warnings/errors automatically with PHP Code Beautifier"
+                },
+                "bamarni-bin": {
+                    "target-directory": "bin/composer"
                 }
             },
             "autoload": {
@@ -573,22 +578,22 @@
             "homepage": "https://github.com/woocommerce/woocommerce-admin",
             "support": {
                 "issues": "https://github.com/woocommerce/woocommerce-admin/issues",
-                "source": "https://github.com/woocommerce/woocommerce-admin/tree/v2.1.4"
+                "source": "https://github.com/woocommerce/woocommerce-admin/tree/v2.3.0"
             },
-            "time": "2021-03-29T11:59:33+00:00"
+            "time": "2021-05-12T15:20:07+00:00"
         },
         {
             "name": "woocommerce/woocommerce-blocks",
-            "version": "v4.7.0",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-gutenberg-products-block.git",
-                "reference": "bf9f70607e718c5f83785cad29b33746db0282d3"
+                "reference": "a4f168596f3832e161b26dec636b69293039ee51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/bf9f70607e718c5f83785cad29b33746db0282d3",
-                "reference": "bf9f70607e718c5f83785cad29b33746db0282d3",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/a4f168596f3832e161b26dec636b69293039ee51",
+                "reference": "a4f168596f3832e161b26dec636b69293039ee51",
                 "shasum": ""
             },
             "require": {
@@ -596,7 +601,7 @@
                 "composer/installers": "^1.7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "6.5.14",
+                "phpunit/phpunit": "7.5.20",
                 "woocommerce/woocommerce-sniffs": "0.1.0"
             },
             "type": "wordpress-plugin",
@@ -624,9 +629,9 @@
             ],
             "support": {
                 "issues": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues",
-                "source": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/tree/v4.7.0"
+                "source": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/tree/v5.1.0"
             },
-            "time": "2021-03-16T16:09:55+00:00"
+            "time": "2021-05-10T15:01:42+00:00"
         }
     ],
     "packages-dev": [
diff --git a/i18n/states.php b/i18n/states.php
index 6065e0771f8..fd423a1ca62 100644
--- a/i18n/states.php
+++ b/i18n/states.php
@@ -1792,6 +1792,33 @@ return array(
 		'AE' => __( 'Armed Forces (AE)', 'woocommerce' ),
 		'AP' => __( 'Armed Forces (AP)', 'woocommerce' ),
 	),
+	'VE' => array( // Venezuela States. Ref: https://github.com/unicode-org/cldr/blob/release-38-1/common/subdivisions/en.xml#L5426-L5451
+		'A' => __( 'Capital', 'woocommerce' ),
+		'B' => __( 'Anzoátegui', 'woocommerce' ),
+		'C' => __( 'Apure', 'woocommerce' ),
+		'D' => __( 'Aragua', 'woocommerce' ),
+		'E' => __( 'Barinas', 'woocommerce' ),
+		'F' => __( 'Bolívar', 'woocommerce' ),
+		'G' => __( 'Carabobo', 'woocommerce' ),
+		'H' => __( 'Cojedes', 'woocommerce' ),
+		'I' => __( 'Falcón', 'woocommerce' ),
+		'J' => __( 'Guárico', 'woocommerce' ),
+		'K' => __( 'Lara', 'woocommerce' ),
+		'L' => __( 'Mérida', 'woocommerce' ),
+		'M' => __( 'Miranda', 'woocommerce' ),
+		'N' => __( 'Monagas', 'woocommerce' ),
+		'O' => __( 'Nueva Esparta', 'woocommerce' ),
+		'P' => __( 'Portuguesa', 'woocommerce' ),
+		'R' => __( 'Sucre', 'woocommerce' ),
+		'S' => __( 'Táchira', 'woocommerce' ),
+		'T' => __( 'Trujillo', 'woocommerce' ),
+		'U' => __( 'Yaracuy', 'woocommerce' ),
+		'V' => __( 'Zulia', 'woocommerce' ),
+		'W' => __( 'Federal Dependencies', 'woocommerce' ),
+		'X' => __( 'Vargas', 'woocommerce' ),
+		'Y' => __( 'Delta Amacuro', 'woocommerce' ),
+		'Z' => __( 'Amazonas', 'woocommerce' )
+	),
 	'VN' => array(),
 	'YT' => array(),
 	'ZA' => array( // South African states.
diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php
index fe29740e569..3dcc281464d 100644
--- a/includes/abstracts/abstract-wc-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-payment-gateway.php
@@ -262,7 +262,9 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 		// Gets order total from "pay for order" page.
 		if ( 0 < $order_id ) {
 			$order = wc_get_order( $order_id );
-			$total = (float) $order->get_total();
+			if ( $order ) {
+				$total = (float) $order->get_total();
+			}
 
 			// Gets order total from cart/checkout.
 		} elseif ( 0 < WC()->cart->total ) {
diff --git a/includes/abstracts/abstract-wc-settings-api.php b/includes/abstracts/abstract-wc-settings-api.php
index f33a62365fc..35bdbe522b7 100644
--- a/includes/abstracts/abstract-wc-settings-api.php
+++ b/includes/abstracts/abstract-wc-settings-api.php
@@ -696,6 +696,7 @@ abstract class WC_Settings_API {
 		);
 
 		$data = wp_parse_args( $data, $defaults );
+		$value = $this->get_option( $key );
 
 		ob_start();
 		?>
@@ -708,7 +709,15 @@ abstract class WC_Settings_API {
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
 					<select class="select <?php echo esc_attr( $data['class'] ); ?>" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); // WPCS: XSS ok. ?>>
 						<?php foreach ( (array) $data['options'] as $option_key => $option_value ) : ?>
-							<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( (string) $option_key, esc_attr( $this->get_option( $key ) ) ); ?>><?php echo esc_html( $option_value ); ?></option>
+							<?php if ( is_array( $option_value ) ) : ?>
+								<optgroup label="<?php echo esc_attr( $option_key ); ?>">
+									<?php foreach ( $option_value as $option_key_inner => $option_value_inner ) : ?>
+										<option value="<?php echo esc_attr( $option_key_inner ); ?>" <?php selected( (string) $option_key_inner, esc_attr( $value ) ); ?>><?php echo esc_html( $option_value_inner ); ?></option>
+									<?php endforeach; ?>
+								</optgroup>
+							<?php else : ?>
+								<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( (string) $option_key, esc_attr( $value ) ); ?>><?php echo esc_html( $option_value ); ?></option>
+							<?php endif; ?>
 						<?php endforeach; ?>
 					</select>
 					<?php echo $this->get_description_html( $data ); // WPCS: XSS ok. ?>
diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php
index ed3a0461368..ff33de129e0 100644
--- a/includes/admin/class-wc-admin-addons.php
+++ b/includes/admin/class-wc-admin-addons.php
@@ -534,6 +534,73 @@ class WC_Admin_Addons {
 		<?php
 	}
 
+	/**
+	 * Handles the output of a full-width block.
+	 *
+	 * @param array $section Section data.
+	 */
+	public static function output_promotion_block( $section ) {
+		if (
+			! current_user_can( 'install_plugins' ) ||
+			! current_user_can( 'activate_plugins' )
+		) {
+			return;
+		}
+
+		$section_object = (object) $section;
+
+		if ( ! empty( $section_object->geowhitelist ) ) {
+			$section_object->geowhitelist = explode( ',', $section_object->geowhitelist );
+		}
+
+		if ( ! empty( $section_object->geoblacklist ) ) {
+			$section_object->geoblacklist = explode( ',', $section_object->geoblacklist );
+		}
+
+		if ( ! self::show_extension( $section_object ) ) {
+			return;
+		}
+
+		?>
+		<div class="addons-banner-block addons-promotion-block">
+			<img
+				class="addons-img"
+				src="<?php echo esc_url( $section['image'] ); ?>"
+				alt="<?php echo esc_attr( $section['image_alt'] ); ?>"
+			/>
+			<div class="addons-promotion-block-content">
+				<h1 class="addons-promotion-block-title"><?php echo esc_html( $section['title'] ); ?></h1>
+				<div class="addons-promotion-block-description">
+					<?php echo wp_kses_post( $section['description'] ); ?>
+				</div>
+				<div class="addons-promotion-block-buttons">
+					<?php
+
+					if ( $section['button_1'] ) {
+						self::output_button(
+							$section['button_1_href'],
+							$section['button_1'],
+							'addons-button-expandable addons-button-solid',
+							$section['plugin']
+						);
+					}
+
+					if ( $section['button_2'] ) {
+						self::output_button(
+							$section['button_2_href'],
+							$section['button_2'],
+							'addons-button-expandable addons-button-outline-purple',
+							$section['plugin']
+						);
+					}
+
+					?>
+				</div>
+			</div>
+		</div>
+		<?php
+	}
+
 	/**
 	 * Handles the outputting of featured sections
 	 *
@@ -566,6 +633,9 @@ class WC_Admin_Addons {
 				case 'wcpay_banner_block':
 					self::output_wcpay_banner_block( (array) $section );
 					break;
+				case 'promotion_block':
+					self::output_promotion_block( (array) $section );
+					break;
 			}
 		}
 	}
diff --git a/includes/admin/class-wc-admin-dashboard-setup.php b/includes/admin/class-wc-admin-dashboard-setup.php
index 0fb9f7cda83..4360241b37f 100644
--- a/includes/admin/class-wc-admin-dashboard-setup.php
+++ b/includes/admin/class-wc-admin-dashboard-setup.php
@@ -162,7 +162,9 @@ if ( ! class_exists( 'WC_Admin_Dashboard_Setup', false ) ) :
 		 * @return bool
 		 */
 		private function should_display_widget() {
-			return 'yes' !== get_option( 'woocommerce_task_list_complete' ) && 'yes' !== get_option( 'woocommerce_task_list_hidden' );
+			return WC()->is_wc_admin_active() &&
+				'yes' !== get_option( 'woocommerce_task_list_complete' ) &&
+				'yes' !== get_option( 'woocommerce_task_list_hidden' );
 		}
 
 		/**
@@ -170,7 +172,7 @@ if ( ! class_exists( 'WC_Admin_Dashboard_Setup', false ) ) :
 		 */
 		private function populate_payment_tasks() {
 			$is_woo_payment_installed = is_plugin_active( 'woocommerce-payments/woocommerce-payments.php' );
-			$country                  = explode( ':', get_option( 'woocommerce_default_country', '' ) )[0];
+			$country                  = explode( ':', get_option( 'woocommerce_default_country', 'US:CA' ) )[0];
 
 			// woocommerce-payments requires its plugin activated and country must be US.
 			if ( ! $is_woo_payment_installed || 'US' !== $country ) {
diff --git a/includes/admin/class-wc-admin-dashboard.php b/includes/admin/class-wc-admin-dashboard.php
index 498eeee78ae..6357b46e8bd 100644
--- a/includes/admin/class-wc-admin-dashboard.php
+++ b/includes/admin/class-wc-admin-dashboard.php
@@ -63,6 +63,10 @@ if ( ! class_exists( 'WC_Admin_Dashboard', false ) ) :
 		 * @return bool
 		 */
 		private function should_display_widget() {
+			if ( ! WC()->is_wc_admin_active() ) {
+				return false;
+			}
+
 			$has_permission           = current_user_can( 'view_woocommerce_reports' ) || current_user_can( 'manage_woocommerce' ) || current_user_can( 'publish_shop_orders' );
 			$task_completed_or_hidden = 'yes' === get_option( 'woocommerce_task_list_complete' ) || 'yes' === get_option( 'woocommerce_task_list_hidden' );
 			return $task_completed_or_hidden && $has_permission;
@@ -127,11 +131,11 @@ if ( ! class_exists( 'WC_Admin_Dashboard', false ) ) :
 
 			$reports = new WC_Admin_Report();
 
-			$net_sales_link = 'admin.php?page=wc-reports&tab=orders&range=month';
+			$net_sales_link  = 'admin.php?page=wc-reports&tab=orders&range=month';
 			$top_seller_link = 'admin.php?page=wc-reports&tab=orders&report=sales_by_product&range=month&product_ids=';
-			$report_data = $is_wc_admin_disabled ? $this->get_sales_report_data() : $this->get_wc_admin_performance_data();
+			$report_data     = $is_wc_admin_disabled ? $this->get_sales_report_data() : $this->get_wc_admin_performance_data();
 			if ( ! $is_wc_admin_disabled ) {
-				$net_sales_link = 'admin.php?page=wc-admin&path=%2Fanalytics%2Frevenue&chart=net_revenue&orderby=net_revenue&period=month&compare=previous_period';
+				$net_sales_link  = 'admin.php?page=wc-admin&path=%2Fanalytics%2Frevenue&chart=net_revenue&orderby=net_revenue&period=month&compare=previous_period';
 				$top_seller_link = 'admin.php?page=wc-admin&filter=single_product&path=%2Fanalytics%2Fproducts&products=';
 			}
 
diff --git a/includes/admin/class-wc-admin-permalink-settings.php b/includes/admin/class-wc-admin-permalink-settings.php
index abcd784d721..04f4ddbd14f 100644
--- a/includes/admin/class-wc-admin-permalink-settings.php
+++ b/includes/admin/class-wc-admin-permalink-settings.php
@@ -3,8 +3,6 @@
  * Adds settings to the permalinks admin settings page
  *
  * @class       WC_Admin_Permalink_Settings
- * @author      WooThemes
- * @category    Admin
  * @package     WooCommerce\Admin
  * @version     2.3.0
  */
@@ -140,23 +138,23 @@ class WC_Admin_Permalink_Settings {
 		<?php wp_nonce_field( 'wc-permalinks', 'wc-permalinks-nonce' ); ?>
 		<script type="text/javascript">
 			jQuery( function() {
-				jQuery('input.wctog').change(function() {
+				jQuery('input.wctog').on( 'change', function() {
 					jQuery('#woocommerce_permalink_structure').val( jQuery( this ).val() );
 				});
-				jQuery('.permalink-structure input').change(function() {
+				jQuery('.permalink-structure input').on( 'change', function() {
 					jQuery('.wc-permalink-structure').find('code.non-default-example, code.default-example').hide();
 					if ( jQuery(this).val() ) {
 						jQuery('.wc-permalink-structure code.non-default-example').show();
-						jQuery('.wc-permalink-structure input').removeAttr('disabled');
+						jQuery('.wc-permalink-structure input').prop('disabled', false);
 					} else {
 						jQuery('.wc-permalink-structure code.default-example').show();
-						jQuery('.wc-permalink-structure input:eq(0)').click();
+						jQuery('.wc-permalink-structure input:eq(0)').trigger( 'click' );
 						jQuery('.wc-permalink-structure input').attr('disabled', 'disabled');
 					}
 				});
-				jQuery('.permalink-structure input:checked').change();
-				jQuery('#woocommerce_permalink_structure').focus( function(){
-					jQuery('#woocommerce_custom_selection').click();
+				jQuery('.permalink-structure input:checked').trigger( 'change' );
+				jQuery('#woocommerce_permalink_structure').on( 'focus', function(){
+					jQuery('#woocommerce_custom_selection').trigger( 'click' );
 				} );
 			} );
 		</script>
diff --git a/includes/admin/class-wc-admin-pointers.php b/includes/admin/class-wc-admin-pointers.php
index 1ca73026713..c846276edde 100644
--- a/includes/admin/class-wc-admin-pointers.php
+++ b/includes/admin/class-wc-admin-pointers.php
@@ -254,12 +254,12 @@ class WC_Admin_Pointers {
 								button2 = $( '<a class=\"button button-primary\" href=\"#\">' + next + '</a>' ),
 								wrapper = $( '<div class=\"wc-pointer-buttons\" />' );
 
-							button.bind( 'click.pointer', function(e) {
+							button.on( 'click.pointer', function(e) {
 								e.preventDefault();
 								t.element.pointer('destroy');
 							});
 
-							button2.bind( 'click.pointer', function(e) {
+							button2.on( 'click.pointer', function(e) {
 								e.preventDefault();
 								t.element.pointer('close');
 							});
diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php
index e2d145206a1..2eaef024a14 100644
--- a/includes/admin/class-wc-admin-post-types.php
+++ b/includes/admin/class-wc-admin-post-types.php
@@ -430,7 +430,10 @@ class WC_Admin_Post_Types {
 		// phpcs:enable WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 
 		$product->set_manage_stock( $manage_stock );
-		$product->set_backorders( $backorders );
+
+		if ( 'external' !== $product->get_type() ) {
+			$product->set_backorders( $backorders );
+		}
 
 		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
 			$stock_amount = 'yes' === $manage_stock && isset( $request_data['_stock'] ) && is_numeric( wp_unslash( $request_data['_stock'] ) ) ? wc_stock_amount( wp_unslash( $request_data['_stock'] ) ) : '';
@@ -550,7 +553,10 @@ class WC_Admin_Post_Types {
 		$stock_amount = 'yes' === $manage_stock && ! empty( $request_data['change_stock'] ) && isset( $request_data['_stock'] ) ? wc_stock_amount( $request_data['_stock'] ) : $product->get_stock_quantity();
 
 		$product->set_manage_stock( $manage_stock );
-		$product->set_backorders( $backorders );
+
+		if ( 'external' !== $product->get_type() ) {
+			$product->set_backorders( $backorders );
+		}
 
 		if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
 			$change_stock = absint( $request_data['change_stock'] );
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 14c11081d8c..255776aa251 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -481,7 +481,7 @@ class WC_Admin_Setup_Wizard {
 		$state          = WC()->countries->get_base_state();
 		$country        = WC()->countries->get_base_country();
 		$postcode       = WC()->countries->get_base_postcode();
-		$currency       = get_option( 'woocommerce_currency', 'GBP' );
+		$currency       = get_option( 'woocommerce_currency', 'USD' );
 		$product_type   = get_option( 'woocommerce_product_type', 'both' );
 		$sell_in_person = get_option( 'woocommerce_sell_in_person', 'none_selected' );
 
diff --git a/includes/admin/class-wc-admin-status.php b/includes/admin/class-wc-admin-status.php
index 0092b8b4383..5c4aeafc70f 100644
--- a/includes/admin/class-wc-admin-status.php
+++ b/includes/admin/class-wc-admin-status.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Utilities\ArrayUtil;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -37,7 +38,8 @@ class WC_Admin_Status {
 			wp_die( 'Cannot load the REST API to access WC_REST_System_Status_Tools_Controller.' );
 		}
 
-		$tools = self::get_tools();
+		$tools                 = self::get_tools();
+		$tool_requires_refresh = false;
 
 		if ( ! empty( $_GET['action'] ) && ! empty( $_REQUEST['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_REQUEST['_wpnonce'] ), 'debug_action' ) ) { // WPCS: input var ok, sanitization ok.
 			$tools_controller = new WC_REST_System_Status_Tools_Controller();
@@ -46,14 +48,16 @@ class WC_Admin_Status {
 			if ( array_key_exists( $action, $tools ) ) {
 				$response = $tools_controller->execute_tool( $action );
 
-				$tool = $tools[ $action ];
-				$tool = array(
+				$tool                  = $tools[ $action ];
+				$tool_requires_refresh = ArrayUtil::get_value_or_default( $tool, 'requires_refresh', false );
+				$tool                  = array(
 					'id'          => $action,
 					'name'        => $tool['name'],
 					'action'      => $tool['button'],
 					'description' => $tool['desc'],
+					'disabled'    => ArrayUtil::get_value_or_default( $tool, 'disabled', false ),
 				);
-				$tool = array_merge( $tool, $response );
+				$tool                  = array_merge( $tool, $response );
 
 				/**
 				 * Fires after a WooCommerce system status tool has been executed.
@@ -80,6 +84,10 @@ class WC_Admin_Status {
 			echo '<div class="updated inline"><p>' . esc_html__( 'Your changes have been saved.', 'woocommerce' ) . '</p></div>';
 		}
 
+		if ( $tool_requires_refresh ) {
+			$tools = self::get_tools();
+		}
+
 		include_once __DIR__ . '/views/html-admin-page-status-tools.php';
 	}
 
diff --git a/includes/admin/class-wc-admin-taxonomies.php b/includes/admin/class-wc-admin-taxonomies.php
index 82651dbc65d..fd6d297dfa1 100644
--- a/includes/admin/class-wc-admin-taxonomies.php
+++ b/includes/admin/class-wc-admin-taxonomies.php
@@ -11,6 +11,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
 }
 
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+
 /**
  * WC_Admin_Taxonomies class.
  */
@@ -49,6 +51,12 @@ class WC_Admin_Taxonomies {
 
 		// Category/term ordering.
 		add_action( 'create_term', array( $this, 'create_term' ), 5, 3 );
+		add_action(
+			'delete_product_cat',
+			function() {
+				wc_get_container()->get( AssignDefaultCategory::class )->schedule_action();
+			}
+		);
 
 		// Add form.
 		add_action( 'product_cat_add_form_fields', array( $this, 'add_category_fields' ) );
@@ -91,7 +99,7 @@ class WC_Admin_Taxonomies {
 	 * @param string $taxonomy Taxonomy slug.
 	 */
 	public function create_term( $term_id, $tt_id = '', $taxonomy = '' ) {
-		if ( 'product_cat' != $taxonomy && ! taxonomy_is_product_attribute( $taxonomy ) ) {
+		if ( 'product_cat' !== $taxonomy && ! taxonomy_is_product_attribute( $taxonomy ) ) {
 			return;
 		}
 
diff --git a/includes/admin/meta-boxes/views/html-order-items.php b/includes/admin/meta-boxes/views/html-order-items.php
index 6a2ff5073ac..55d11d01ed0 100644
--- a/includes/admin/meta-boxes/views/html-order-items.php
+++ b/includes/admin/meta-boxes/views/html-order-items.php
@@ -189,7 +189,10 @@ if ( wc_tax_enabled() ) {
 					<td class="label"><?php echo esc_html( $tax_total->label ); ?>:</td>
 					<td width="1%"></td>
 					<td class="total">
-						<?php echo wc_price( $tax_total->amount, array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+						<?php
+							// We use wc_round_tax_total here because tax may need to be round up or round down depending upon settings, whereas wc_price alone will always round it down.
+							echo wc_price( wc_round_tax_total( $tax_total->amount ), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+						?>
 					</td>
 				</tr>
 			<?php endforeach; ?>
diff --git a/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php b/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
index 5920fb52616..edc091946dc 100644
--- a/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
+++ b/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
@@ -157,7 +157,7 @@ class WC_Plugins_Screen_Updates extends WC_Plugin_Updates {
 					$update_link.removeClass( 'wc-thickbox open-plugin-details-modal' );
 					$update_link.addClass( 'update-link' );
 					$update_link.attr( 'href', update_url );
-					$update_link.click();
+					$update_link.trigger( 'click' );
 				});
 
 				$( '#wc_untested_extensions_modal .cancel' ).on( 'click', function( evt ) {
diff --git a/includes/admin/plugin-updates/class-wc-updates-screen-updates.php b/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
index 7d2cbb9de8d..233a7bfa897 100644
--- a/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
+++ b/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
@@ -69,7 +69,7 @@ class WC_Updates_Screen_Updates extends WC_Plugin_Updates {
 					}
 					var $checkbox = $( 'input[value="woocommerce/woocommerce.php"]' );
 					if ( $checkbox.prop( 'checked' ) ) {
-						$( '#wc-upgrade-warning' ).click();
+						$( '#wc-upgrade-warning' ).trigger( 'click' );
 					}
 				}
 
diff --git a/includes/admin/reports/class-wc-report-coupon-usage.php b/includes/admin/reports/class-wc-report-coupon-usage.php
index 01c83d84198..e5e8aade6d6 100644
--- a/includes/admin/reports/class-wc-report-coupon-usage.php
+++ b/includes/admin/reports/class-wc-report-coupon-usage.php
@@ -343,9 +343,9 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 			} );
 			jQuery( '.section' ).slideUp( 100, function() {
 				<?php if ( empty( $this->coupon_codes ) ) : ?>
-					jQuery( '.section_title:eq(1)' ).click();
+					jQuery( '.section_title:eq(1)' ).trigger( 'click' );
 				<?php else : ?>
-					jQuery( '.section_title:eq(0)' ).click();
+					jQuery( '.section_title:eq(0)' ).trigger( 'click' );
 				<?php endif; ?>
 			} );
 		</script>
@@ -551,15 +551,15 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
 						}
 					);
 
-					jQuery('.chart-placeholder').resize();
+					jQuery('.chart-placeholder').trigger( 'resize' );
 				}
 
 				drawGraph();
 
-				jQuery('.highlight_series').hover(
+				jQuery('.highlight_series').on( 'mouseenter',
 					function() {
 						drawGraph( jQuery(this).data('series') );
-					},
+					} ).on( 'mouseleave',
 					function() {
 						drawGraph();
 					}
diff --git a/includes/admin/reports/class-wc-report-customers.php b/includes/admin/reports/class-wc-report-customers.php
index 0096a73f993..3366c01ef55 100644
--- a/includes/admin/reports/class-wc-report-customers.php
+++ b/includes/admin/reports/class-wc-report-customers.php
@@ -155,7 +155,7 @@ class WC_Report_Customers extends WC_Admin_Report {
 					}
 				);
 
-				jQuery('.chart-placeholder.customers_vs_guests').resize();
+				jQuery('.chart-placeholder.customers_vs_guests').trigger( 'resize' );
 			});
 		</script>
 		<?php
@@ -412,15 +412,15 @@ class WC_Report_Customers extends WC_Admin_Report {
 							],
 						}
 					);
-					jQuery('.chart-placeholder').resize();
+					jQuery('.chart-placeholder').trigger( 'resize' );
 				}
 
 				drawGraph();
 
-				jQuery('.highlight_series').hover(
+				jQuery('.highlight_series').on( 'mouseenter',
 					function() {
 						drawGraph( jQuery(this).data('series') );
-					},
+					} ).on( 'mouseleave',
 					function() {
 						drawGraph();
 					}
diff --git a/includes/admin/reports/class-wc-report-sales-by-category.php b/includes/admin/reports/class-wc-report-sales-by-category.php
index 390e9de2c24..dda8c193885 100644
--- a/includes/admin/reports/class-wc-report-sales-by-category.php
+++ b/includes/admin/reports/class-wc-report-sales-by-category.php
@@ -12,8 +12,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * WC_Report_Sales_By_Category
  *
- * @author      WooThemes
- * @category    Admin
  * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
@@ -171,11 +169,11 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 
 					switch ( $this->chart_groupby ) {
 						case 'day':
-							$time = strtotime( date( 'Ymd', strtotime( $order_item->post_date ) ) ) * 1000;
+							$time = strtotime( gmdate( 'Ymd', strtotime( $order_item->post_date ) ) ) * 1000;
 							break;
 						case 'month':
 						default:
-							$time = strtotime( date( 'Ym', strtotime( $order_item->post_date ) ) . '01' ) * 1000;
+							$time = strtotime( gmdate( 'Ym', strtotime( $order_item->post_date ) ) . '01' ) * 1000;
 							break;
 					}
 
@@ -244,13 +242,13 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 					// Select all/None
 					jQuery( '.chart-widget' ).on( 'click', '.select_all', function() {
 						jQuery(this).closest( 'div' ).find( 'select option' ).attr( 'selected', 'selected' );
-						jQuery(this).closest( 'div' ).find('select').change();
+						jQuery(this).closest( 'div' ).find('select').trigger( 'change' );
 						return false;
 					});
 
 					jQuery( '.chart-widget').on( 'click', '.select_none', function() {
-						jQuery(this).closest( 'div' ).find( 'select option' ).removeAttr( 'selected' );
-						jQuery(this).closest( 'div' ).find('select').change();
+						jQuery(this).closest( 'div' ).find( 'select option' ).prop( 'selected', false );
+						jQuery(this).closest( 'div' ).find('select').trigger( 'change' );
 						return false;
 					});
 				});
@@ -307,11 +305,11 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 
 					switch ( $this->chart_groupby ) {
 						case 'day':
-							$time = strtotime( date( 'Ymd', strtotime( "+{$i} DAY", $this->start_date ) ) ) * 1000;
+							$time = strtotime( gmdate( 'Ymd', strtotime( "+{$i} DAY", $this->start_date ) ) ) * 1000;
 							break;
 						case 'month':
 						default:
-							$time = strtotime( date( 'Ym', strtotime( "+{$i} MONTH", $this->start_date ) ) . '01' ) * 1000;
+							$time = strtotime( gmdate( 'Ym', strtotime( "+{$i} MONTH", $this->start_date ) ) . '01' ) * 1000;
 							break;
 					}
 
@@ -430,16 +428,16 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
 							}
 						);
 
-						jQuery('.chart-placeholder').resize();
+						jQuery('.chart-placeholder').trigger( 'resize' );
 
 					}
 
 					drawGraph();
 
-					jQuery('.highlight_series').hover(
+					jQuery('.highlight_series').on( 'mouseenter',
 						function() {
 							drawGraph( jQuery(this).data('series') );
-						},
+						} ).on( 'mouseleave',
 						function() {
 							drawGraph();
 						}
diff --git a/includes/admin/reports/class-wc-report-sales-by-date.php b/includes/admin/reports/class-wc-report-sales-by-date.php
index 705917bef77..280aa359595 100644
--- a/includes/admin/reports/class-wc-report-sales-by-date.php
+++ b/includes/admin/reports/class-wc-report-sales-by-date.php
@@ -849,15 +849,15 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
 						}
 					);
 
-					jQuery('.chart-placeholder').resize();
+					jQuery('.chart-placeholder').trigger( 'resize' );
 				}
 
 				drawGraph();
 
-				jQuery('.highlight_series').hover(
+				jQuery('.highlight_series').on( 'mouseenter',
 					function() {
 						drawGraph( jQuery(this).data('series') );
-					},
+					} ).on( 'mouseleave',
 					function() {
 						drawGraph();
 					}
diff --git a/includes/admin/reports/class-wc-report-sales-by-product.php b/includes/admin/reports/class-wc-report-sales-by-product.php
index 31fd3211b00..0b7b8d26cdf 100644
--- a/includes/admin/reports/class-wc-report-sales-by-product.php
+++ b/includes/admin/reports/class-wc-report-sales-by-product.php
@@ -389,7 +389,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 			} );
 			jQuery( '.section' ).slideUp( 100, function() {
 				<?php if ( empty( $this->product_ids ) ) : ?>
-					jQuery( '.section_title:eq(1)' ).click();
+					jQuery( '.section_title:eq(1)' ).trigger( 'click' );
 				<?php endif; ?>
 			} );
 		</script>
@@ -610,15 +610,15 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
 							}
 						);
 
-						jQuery('.chart-placeholder').resize();
+						jQuery('.chart-placeholder').trigger( 'resize' );
 					}
 
 					drawGraph();
 
-					jQuery('.highlight_series').hover(
+					jQuery('.highlight_series').on( 'mouseenter',
 						function() {
 							drawGraph( jQuery(this).data('series') );
-						},
+						} ).on( 'mouseleave',
 						function() {
 							drawGraph();
 						}
diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php
index f5b1f75a0fd..0543e42631e 100644
--- a/includes/admin/settings/class-wc-settings-emails.php
+++ b/includes/admin/settings/class-wc-settings-emails.php
@@ -46,12 +46,19 @@ class WC_Settings_Emails extends WC_Settings_Page {
 	 * @return array
 	 */
 	public function get_settings() {
+		$desc_help_text = sprintf(
+		/* translators: %1$s: Link to WP Mail Logging plugin, %2$s: Link to Email FAQ support page. */
+			__( 'To ensure your store&rsquo;s notifications arrive in your and your customers&rsquo; inboxes, we recommend connecting your email address to your domain and setting up a dedicated SMTP server. If something doesn&rsquo;t seem to be sending correctly, install the <a href="%1$s">WP Mail Logging Plugin</a> or check the <a href="%2$s">Email FAQ page</a>.', 'woocommerce' ),
+			'https://wordpress.org/plugins/wp-mail-logging/',
+			'https://docs.woocommerce.com/document/email-faq'
+		);
 		$settings = apply_filters(
 			'woocommerce_email_settings',
 			array(
 				array(
 					'title' => __( 'Email notifications', 'woocommerce' ),
-					'desc'  => __( 'Email notifications sent from WooCommerce are listed below. Click on an email to configure it.', 'woocommerce' ),
+					/* translators: %s: help description with link to WP Mail logging and support page. */
+					'desc'  => sprintf( __( 'Email notifications sent from WooCommerce are listed below. Click on an email to configure it.<br>%s', 'woocommerce' ), $desc_help_text ),
 					'type'  => 'title',
 					'id'    => 'email_notification_settings',
 				),
diff --git a/includes/admin/settings/class-wc-settings-general.php b/includes/admin/settings/class-wc-settings-general.php
index 8535dd7f956..1476c428c0c 100644
--- a/includes/admin/settings/class-wc-settings-general.php
+++ b/includes/admin/settings/class-wc-settings-general.php
@@ -81,7 +81,7 @@ class WC_Settings_General extends WC_Settings_Page {
 					'title'    => __( 'Country / State', 'woocommerce' ),
 					'desc'     => __( 'The country and state or province, if any, in which your business is located.', 'woocommerce' ),
 					'id'       => 'woocommerce_default_country',
-					'default'  => 'GB',
+					'default'  => 'US:CA',
 					'type'     => 'single_select_country',
 					'desc_tip' => true,
 				),
@@ -229,7 +229,7 @@ class WC_Settings_General extends WC_Settings_Page {
 					'title'    => __( 'Currency', 'woocommerce' ),
 					'desc'     => __( 'This controls what currency prices are listed at in the catalog and which currency gateways will take payments in.', 'woocommerce' ),
 					'id'       => 'woocommerce_currency',
-					'default'  => 'GBP',
+					'default'  => 'USD',
 					'type'     => 'select',
 					'class'    => 'wc-enhanced-select',
 					'desc_tip' => true,
diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index eaaf56dd984..364867666f5 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -63,7 +63,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 							$topic_data = WC_Admin_Webhooks::get_topic_data( $webhook );
 
 							$topics = apply_filters(
-								'woocommerce_webhook_topics', array(
+								'woocommerce_webhook_topics',
+								array(
 									''                 => __( 'Select an option&hellip;', 'woocommerce' ),
 									'coupon.created'   => __( 'Coupon created', 'woocommerce' ),
 									'coupon.updated'   => __( 'Coupon updated', 'woocommerce' ),
@@ -197,8 +198,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 								add_query_arg(
 									array(
 										'delete' => $webhook->get_id(),
-									), admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' )
-								), 'delete-webhook'
+									),
+									admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' )
+								),
+								'delete-webhook'
 							);
 							?>
 							<a style="color: #a00; text-decoration: none; margin-left: 10px;" href="<?php echo esc_url( $delete_url ); ?>"><?php esc_html_e( 'Delete permanently', 'woocommerce' ); ?></a>
@@ -221,6 +224,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 			if ( 'action' === current ) {
 				action_event_field.show();
 			}
-		}).change();
+		}).trigger( 'change' );
 	});
 </script>
diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php
index ceea4ec99e5..3a8dd3648ed 100644
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@@ -56,8 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 				value="<?php echo esc_attr( isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '' ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>"
 				placeholder="<?php esc_attr_e( 'Enter a search term and press enter', 'woocommerce' ); ?>">
 			<input type="hidden" name="page" value="wc-addons">
-			<?php $page_section = ( isset( $_GET['section'] ) && '_featured' !== $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_all'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>
-			<input type="hidden" name="section" value="<?php echo esc_attr( $page_section ); ?>">
+			<input type="hidden" name="section" value="_all">
 		</form>
 		<?php if ( '_featured' === $current_section ) : ?>
 			<div class="addons-featured">
diff --git a/includes/admin/views/html-admin-page-status-tools.php b/includes/admin/views/html-admin-page-status-tools.php
index a1c5f72d9e5..b6d9dacaafc 100644
--- a/includes/admin/views/html-admin-page-status-tools.php
+++ b/includes/admin/views/html-admin-page-status-tools.php
@@ -1,8 +1,12 @@
 <?php
 /**
  * Admin View: Page - Status Tools
+ *
+ * @package WooCommerce
  */
 
+use Automattic\WooCommerce\Utilities\ArrayUtil;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -12,14 +16,14 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<?php settings_fields( 'woocommerce_status_settings_fields' ); ?>
 	<table class="wc_status_table wc_status_table--tools widefat" cellspacing="0">
 		<tbody class="tools">
-			<?php foreach ( $tools as $action => $tool ) : ?>
-				<tr class="<?php echo sanitize_html_class( $action ); ?>">
+			<?php foreach ( $tools as $action_name => $tool ) : ?>
+				<tr class="<?php echo sanitize_html_class( $action_name ); ?>">
 					<th>
 						<strong class="name"><?php echo esc_html( $tool['name'] ); ?></strong>
 						<p class="description"><?php echo wp_kses_post( $tool['desc'] ); ?></p>
 					</th>
 					<td class="run-tool">
-						<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=' . $action ), 'debug_action' ); ?>" class="button button-large <?php echo esc_attr( $action ); ?>"><?php echo esc_html( $tool['button'] ); ?></a>
+						<a <?php echo ArrayUtil::is_truthy( $tool, 'disabled' ) ? 'disabled' : ''; ?> href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=' . $action_name ), 'debug_action' ) ); ?>" class="button button-large <?php echo esc_attr( $action_name ); ?>"><?php echo esc_html( $tool['button'] ); ?></a>
 					</td>
 				</tr>
 			<?php endforeach; ?>
diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php
index 10e27e7e2f4..b35d97d6590 100644
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@@ -810,7 +810,7 @@ class WC_AJAX {
 
 			if ( ! empty( $files ) ) {
 				foreach ( $files as $download_id => $file ) {
-					$inserted_id = wc_downloadable_file_permission( $download_id, $product_id, $order, $item->get_quantity(), $item );
+					$inserted_id = wc_downloadable_file_permission( $download_id, $product->get_id(), $order, $item->get_quantity(), $item );
 					if ( $inserted_id ) {
 						$download = new WC_Customer_Download( $inserted_id );
 						$loop ++;
diff --git a/includes/class-wc-cart-totals.php b/includes/class-wc-cart-totals.php
index facee43a729..54afe9827ca 100644
--- a/includes/class-wc-cart-totals.php
+++ b/includes/class-wc-cart-totals.php
@@ -750,8 +750,9 @@ final class WC_Cart_Totals {
 
 		$items_subtotal = $this->get_rounded_items_total( $this->get_values_for_total( 'subtotal' ) );
 
-		$this->set_total( 'items_subtotal', NumberUtil::round( $items_subtotal ) );
-		$this->set_total( 'items_subtotal_tax', wc_round_tax_total( array_sum( $merged_subtotal_taxes ), 0 ) );
+		// Prices are not rounded here because they should already be rounded based on settings in `get_rounded_items_total` and in `round_line_tax` method calls.
+		$this->set_total( 'items_subtotal', $items_subtotal );
+		$this->set_total( 'items_subtotal_tax', array_sum( $merged_subtotal_taxes ), 0 );
 
 		$this->cart->set_subtotal( $this->get_total( 'items_subtotal' ) );
 		$this->cart->set_subtotal_tax( $this->get_total( 'items_subtotal_tax' ) );
@@ -788,7 +789,7 @@ final class WC_Cart_Totals {
 
 					if ( $item->product->is_taxable() ) {
 						// Item subtotals were sent, so set 3rd param.
-						$item_tax = wc_round_tax_total( array_sum( WC_Tax::calc_tax( $coupon_discount, $item->tax_rates, $item->price_includes_tax ) ), 0 );
+						$item_tax = array_sum( WC_Tax::calc_tax( $coupon_discount, $item->tax_rates, $item->price_includes_tax ) );
 
 						// Sum total tax.
 						$coupon_discount_tax_amounts[ $coupon_code ] += $item_tax;
@@ -862,7 +863,10 @@ final class WC_Cart_Totals {
 	 */
 	protected function calculate_totals() {
 		$this->set_total( 'total', NumberUtil::round( $this->get_total( 'items_total', true ) + $this->get_total( 'fees_total', true ) + $this->get_total( 'shipping_total', true ) + array_sum( $this->get_merged_taxes( true ) ), 0 ) );
-		$this->cart->set_total_tax( array_sum( $this->get_merged_taxes( false ) ) );
+		$items_tax = array_sum( $this->get_merged_taxes( false, array( 'items' ) ) );
+		// Shipping and fee taxes are rounded seperately because they were entered excluding taxes (as opposed to item prices, which may or may not be including taxes depending upon settings).
+		$shipping_and_fee_taxes = NumberUtil::round( array_sum( $this->get_merged_taxes( false, array( 'fees', 'shipping' ) ) ), wc_get_price_decimals() );
+		$this->cart->set_total_tax( $items_tax + $shipping_and_fee_taxes );
 
 		// Allow plugins to hook and alter totals before final total is calculated.
 		if ( has_action( 'woocommerce_calculate_totals' ) ) {
diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index 1103ee053e5..e5cca710813 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -430,7 +430,7 @@ class WC_Cart extends WC_Legacy_Cart {
 	 * @param string $value Value to set.
 	 */
 	public function set_subtotal( $value ) {
-		$this->totals['subtotal'] = wc_format_decimal( $value, wc_get_price_decimals() );
+		$this->totals['subtotal'] = wc_format_decimal( $value );
 	}
 
 	/**
@@ -470,7 +470,7 @@ class WC_Cart extends WC_Legacy_Cart {
 	 * @param string $value Value to set.
 	 */
 	public function set_shipping_total( $value ) {
-		$this->totals['shipping_total'] = wc_format_decimal( $value, wc_get_price_decimals() );
+		$this->totals['shipping_total'] = wc_format_decimal( $value );
 	}
 
 	/**
@@ -490,7 +490,7 @@ class WC_Cart extends WC_Legacy_Cart {
 	 * @param string $value Value to set.
 	 */
 	public function set_cart_contents_total( $value ) {
-		$this->totals['cart_contents_total'] = wc_format_decimal( $value, wc_get_price_decimals() );
+		$this->totals['cart_contents_total'] = wc_format_decimal( $value );
 	}
 
 	/**
@@ -531,7 +531,7 @@ class WC_Cart extends WC_Legacy_Cart {
 	 * @param string $value Value to set.
 	 */
 	public function set_fee_total( $value ) {
-		$this->totals['fee_total'] = wc_format_decimal( $value, wc_get_price_decimals() );
+		$this->totals['fee_total'] = wc_format_decimal( $value );
 	}
 
 	/**
@@ -1218,15 +1218,30 @@ class WC_Cart extends WC_Legacy_Cart {
 				$products_qty_in_cart = $this->get_cart_item_quantities();
 
 				if ( isset( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ] ) && ! $product_data->has_enough_stock( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ] + $quantity ) ) {
-					throw new Exception(
-						sprintf(
-							'<a href="%s" class="button wc-forward">%s</a> %s',
-							wc_get_cart_url(),
-							__( 'View cart', 'woocommerce' ),
-							/* translators: 1: quantity in stock 2: current quantity */
-							sprintf( __( 'You cannot add that amount to the cart &mdash; we have %1$s in stock and you already have %2$s in your cart.', 'woocommerce' ), wc_format_stock_quantity_for_display( $product_data->get_stock_quantity(), $product_data ), wc_format_stock_quantity_for_display( $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ], $product_data ) )
-						)
+					$stock_quantity         = $product_data->get_stock_quantity();
+					$stock_quantity_in_cart = $products_qty_in_cart[ $product_data->get_stock_managed_by_id() ];
+
+					$message = sprintf(
+						'<a href="%s" class="button wc-forward">%s</a> %s',
+						wc_get_cart_url(),
+						__( 'View cart', 'woocommerce' ),
+						/* translators: 1: quantity in stock 2: current quantity */
+						sprintf( __( 'You cannot add that amount to the cart &mdash; we have %1$s in stock and you already have %2$s in your cart.', 'woocommerce' ), wc_format_stock_quantity_for_display( $stock_quantity, $product_data ), wc_format_stock_quantity_for_display( $stock_quantity_in_cart, $product_data ) )
 					);
+
+					/**
+					 * Filters message about product not having enough stock accounting for what's already in the cart.
+					 *
+					 * @param string $message Message.
+					 * @param WC_Product $product_data Product data.
+					 * @param int $stock_quantity Quantity remaining.
+					 * @param int $stock_quantity_in_cart
+					 *
+					 * @since 5.3.0
+					 */
+					$message = apply_filters( 'woocommerce_cart_product_not_enough_stock_already_in_cart_message', $message, $product_data, $stock_quantity, $stock_quantity_in_cart );
+
+					throw new Exception( $message );
 				}
 			}
 
diff --git a/includes/class-wc-checkout.php b/includes/class-wc-checkout.php
index 4d92bbca60e..036c4ba612c 100644
--- a/includes/class-wc-checkout.php
+++ b/includes/class-wc-checkout.php
@@ -747,7 +747,7 @@ class WC_Checkout {
 				$field_label = isset( $field['label'] ) ? $field['label'] : '';
 
 				if ( $validate_fieldset &&
-					( isset( $field['type'] ) && 'country' === $field['type'] ) &&
+					( isset( $field['type'] ) && 'country' === $field['type'] && '' !== $data[ $key ] ) &&
 					! WC()->countries->country_exists( $data[ $key ] ) ) {
 						/* translators: ISO 3166-1 alpha-2 country code */
 						$errors->add( $key . '_validation', sprintf( __( "'%s' is not a valid country code.", 'woocommerce' ), $data[ $key ] ) );
diff --git a/includes/class-wc-customer.php b/includes/class-wc-customer.php
index 3c5c53079f3..da549f99907 100644
--- a/includes/class-wc-customer.php
+++ b/includes/class-wc-customer.php
@@ -242,6 +242,27 @@ class WC_Customer extends WC_Legacy_Customer {
 		return $this->get_calculated_shipping();
 	}
 
+	/**
+	 * Indicates if the customer has a non-empty shipping address.
+	 *
+	 * Note that this does not indicate if the customer's shipping address
+	 * is complete, only that one or more fields are populated.
+	 *
+	 * @since 5.3.0
+	 *
+	 * @return bool
+	 */
+	public function has_shipping_address() {
+		foreach ( $this->get_shipping() as $address_field ) {
+			// Trim guards against a case where a subset of saved shipping address fields contain whitespace.
+			if ( strlen( trim( $address_field ) ) > 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Get if customer is VAT exempt?
 	 *
@@ -449,7 +470,19 @@ class WC_Customer extends WC_Legacy_Customer {
 	 * @return array
 	 */
 	public function get_billing( $context = 'view' ) {
-		return $this->get_prop( 'billing', $context );
+		$value = null;
+		$prop  = 'billing';
+
+		if ( array_key_exists( $prop, $this->data ) ) {
+			$changes = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : array();
+			$value   = array_merge( $this->data[ $prop ], $changes );
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			}
+		}
+
+		return $value;
 	}
 
 	/**
@@ -580,7 +613,19 @@ class WC_Customer extends WC_Legacy_Customer {
 	 * @return array
 	 */
 	public function get_shipping( $context = 'view' ) {
-		return $this->get_prop( 'shipping', $context );
+		$value = null;
+		$prop  = 'shipping';
+
+		if ( array_key_exists( $prop, $this->data ) ) {
+			$changes = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : array();
+			$value   = array_merge( $this->data[ $prop ], $changes );
+
+			if ( 'view' === $context ) {
+				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			}
+		}
+
+		return $value;
 	}
 
 	/**
diff --git a/includes/class-wc-frontend-scripts.php b/includes/class-wc-frontend-scripts.php
index c84b60c094c..68ad242910f 100644
--- a/includes/class-wc-frontend-scripts.php
+++ b/includes/class-wc-frontend-scripts.php
@@ -224,7 +224,7 @@ class WC_Frontend_Scripts {
 			'selectWoo'                  => array(
 				'src'     => self::get_asset_url( 'assets/js/selectWoo/selectWoo.full' . $suffix . '.js' ),
 				'deps'    => array( 'jquery' ),
-				'version' => '1.0.6',
+				'version' => '1.0.9',
 			),
 			'wc-address-i18n'            => array(
 				'src'     => self::get_asset_url( 'assets/js/frontend/address-i18n' . $suffix . '.js' ),
diff --git a/includes/class-wc-logger.php b/includes/class-wc-logger.php
index 040dd580529..fed86dea651 100644
--- a/includes/class-wc-logger.php
+++ b/includes/class-wc-logger.php
@@ -139,11 +139,23 @@ class WC_Logger implements WC_Logger_Interface {
 		}
 
 		if ( $this->should_handle( $level ) ) {
-			$timestamp = current_time( 'timestamp', 1 );
-			$message   = apply_filters( 'woocommerce_logger_log_message', $message, $level, $context );
+			$timestamp = time();
 
 			foreach ( $this->handlers as $handler ) {
-				$handler->handle( $timestamp, $level, $message, $context );
+				/**
+				 * Filter the logging message. Returning null will prevent logging from occuring since 5.3.
+				 *
+				 * @since 3.1
+				 * @param string $message Log message.
+				 * @param string $level   One of: emergency, alert, critical, error, warning, notice, info, or debug.
+				 * @param array  $context Additional information for log handlers.
+				 * @param object $handler The handler object, such as WC_Log_Handler_File. Available since 5.3.
+				 */
+				$message = apply_filters( 'woocommerce_logger_log_message', $message, $level, $context, $handler );
+
+				if ( null !== $message ) {
+					$handler->handle( $timestamp, $level, $message, $context );
+				}
 			}
 		}
 	}
diff --git a/includes/class-wc-order.php b/includes/class-wc-order.php
index 516f905b10b..87bbc0b8835 100644
--- a/includes/class-wc-order.php
+++ b/includes/class-wc-order.php
@@ -179,7 +179,7 @@ class WC_Order extends WC_Abstract_Order {
 		}
 
 		if ( $total_refunded && $display_refunded ) {
-			$formatted_total = '<del>' . wp_strip_all_tags( $formatted_total ) . '</del> <ins>' . wc_price( $order_total - $total_refunded, array( 'currency' => $this->get_currency() ) ) . $tax_string . '</ins>';
+			$formatted_total = '<del aria-hidden="true">' . wp_strip_all_tags( $formatted_total ) . '</del> <ins>' . wc_price( $order_total - $total_refunded, array( 'currency' => $this->get_currency() ) ) . $tax_string . '</ins>';
 		} else {
 			$formatted_total .= $tax_string;
 		}
diff --git a/includes/class-wc-tax.php b/includes/class-wc-tax.php
index a59f60cc4de..bf6956e6639 100644
--- a/includes/class-wc-tax.php
+++ b/includes/class-wc-tax.php
@@ -82,7 +82,13 @@ class WC_Tax {
 	 * @return array
 	 */
 	public static function calc_shipping_tax( $price, $rates ) {
+		// Backwards compatible from WC_Shipping_Rate::get_cost().
+		if ( has_filter( 'woocommerce_shipping_rate_cost' ) ) {
+			$rate  = new WC_Shipping_Rate();
+			$price = $rate->get_cost();
+		}
 		$taxes = self::calc_exclusive_tax( $price, $rates );
+
 		return apply_filters( 'woocommerce_calc_shipping_tax', $taxes, $price, $rates );
 	}
 
diff --git a/includes/class-wc-template-loader.php b/includes/class-wc-template-loader.php
index 5a3233756fa..bdb728da65d 100644
--- a/includes/class-wc-template-loader.php
+++ b/includes/class-wc-template-loader.php
@@ -139,7 +139,7 @@ class WC_Template_Loader {
 				if ( 0 === $validated_file ) {
 					$templates[] = $page_template;
 				} else {
-					error_log( "WooCommerce: Unable to validate template path: \"$page_template\". Error Code: $validated_file." );
+					error_log( "WooCommerce: Unable to validate template path: \"$page_template\". Error Code: $validated_file." ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
 				}
 			}
 		}
@@ -294,8 +294,8 @@ class WC_Template_Loader {
 		}
 
 		// Description handling.
-		if ( ! empty( $queried_object->description ) && ( empty( $_GET['product-page'] ) || 1 === absint( $_GET['product-page'] ) ) ) { // WPCS: input var ok, CSRF ok.
-			$prefix = '<div class="term-description">' . wc_format_content( $queried_object->description ) . '</div>'; // WPCS: XSS ok.
+		if ( ! empty( $queried_object->description ) && ( empty( $_GET['product-page'] ) || 1 === absint( $_GET['product-page'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$prefix = '<div class="term-description">' . wc_format_content( wp_kses_post( $queried_object->description ) ) . '</div>';
 		} else {
 			$prefix = '';
 		}
diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 9b009e035ea..582a2210d19 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -355,122 +355,170 @@ class WC_Tracker {
 	}
 
 	/**
-	 * Get all order data.
+	 * Get order counts.
+	 *
+	 * @return array
+	 */
+	private static function get_order_counts() {
+		$order_count      = array();
+		$order_count_data = wp_count_posts( 'shop_order' );
+		foreach ( wc_get_order_statuses() as $status_slug => $status_name ) {
+			$order_count[ $status_slug ] = $order_count_data->{ $status_slug };
+		}
+		return $order_count;
+	}
+
+	/**
+	 * Combine all order data.
 	 *
 	 * @return array
 	 */
 	private static function get_orders() {
-		$args = array(
-			'type'  => array( 'shop_order', 'shop_order_refund' ),
-			'limit' => get_option( 'posts_per_page' ),
-			'paged' => 1,
+		$order_dates    = self::get_order_dates();
+		$order_counts   = self::get_order_counts();
+		$order_totals   = self::get_order_totals();
+		$order_gateways = self::get_orders_by_gateway();
+
+		return array_merge( $order_dates, $order_counts, $order_totals, $order_gateways );
+	}
+
+	/**
+	 * Get order totals.
+	 *
+	 * @since 5.4.0
+	 * @return array
+	 */
+	private static function get_order_totals() {
+		global $wpdb;
+
+		$gross_total = $wpdb->get_var(
+			"
+			SELECT
+				SUM( order_meta.meta_value ) AS 'gross_total'
+			FROM {$wpdb->prefix}posts AS orders
+			LEFT JOIN {$wpdb->prefix}postmeta AS order_meta ON order_meta.post_id = orders.ID
+			WHERE order_meta.meta_key =  '_order_total'
+				AND orders.post_status in ( 'wc-completed', 'wc-refunded' )
+			GROUP BY order_meta.meta_key
+		"
 		);
 
-		$first            = time();
-		$processing_first = $first;
-		$first_time       = $first;
-		$last             = 0;
-		$processing_last  = 0;
-		$order_data       = array();
-
-		$orders       = wc_get_orders( $args );
-		$orders_count = count( $orders );
-
-		while ( $orders_count ) {
-
-			foreach ( $orders as $order ) {
-
-				$date_created = (int) $order->get_date_created()->getTimestamp();
-				$type         = $order->get_type();
-				$status       = $order->get_status();
-
-				if ( 'shop_order' == $type ) {
-
-					// Find the first and last order dates for completed and processing statuses.
-					if ( 'completed' == $status && $date_created < $first ) {
-						$first = $date_created;
-					}
-					if ( 'completed' == $status && $date_created > $last ) {
-						$last = $date_created;
-					}
-					if ( 'processing' == $status && $date_created < $processing_first ) {
-						$processing_first = $date_created;
-					}
-					if ( 'processing' == $status && $date_created > $processing_last ) {
-						$processing_last = $date_created;
-					}
-
-					// Get order counts by status.
-					$status = 'wc-' . $status;
-
-					if ( ! isset( $order_data[ $status ] ) ) {
-						$order_data[ $status ]  = 1;
-					} else {
-						$order_data[ $status ] += 1;
-					}
-
-					// Count number of orders by gateway used.
-					$gateway = $order->get_payment_method();
-
-					if ( ! empty( $gateway ) && in_array( $status, array( 'wc-completed', 'wc-refunded', 'wc-processing' ) ) ) {
-						$gateway = 'gateway_' . $gateway;
-
-						if ( ! isset( $order_data[ $gateway ] ) ) {
-							$order_data[ $gateway ]  = 1;
-						} else {
-							$order_data[ $gateway ] += 1;
-						}
-					}
-				} else {
-					// If it is a refunded order (shop_order_refunnd type), add the prefix as this prefix gets
-					// added midway in the if clause.
-					$status = 'wc-' . $status;
-				}
-
-				// Calculate the gross total for 'completed' and 'processing' orders.
-				$total = $order->get_total();
-
-				if ( in_array( $status, array( 'wc-completed', 'wc-refunded' ) ) ) {
-					if ( ! isset( $order_data['gross'] ) ) {
-						$order_data['gross']  = $total;
-					} else {
-						$order_data['gross'] += $total;
-					}
-				} elseif ( 'wc-processing' == $status ) {
-					if ( ! isset( $order_data['processing_gross'] ) ) {
-						$order_data['processing_gross']  = $total;
-					} else {
-						$order_data['processing_gross'] += $total;
-					}
-				}
-			}
-			$args['paged']++;
-
-			$orders       = wc_get_orders( $args );
-			$orders_count = count( $orders );
+		if ( is_null( $gross_total ) ) {
+			$gross_total = 0;
 		}
 
-		if ( $first !== $first_time ) {
-			$order_data['first'] = gmdate( 'Y-m-d H:i:s', $first );
+		$processing_gross_total = $wpdb->get_var(
+			"
+			SELECT
+				SUM( order_meta.meta_value ) AS 'gross_total'
+			FROM {$wpdb->prefix}posts AS orders
+			LEFT JOIN {$wpdb->prefix}postmeta AS order_meta ON order_meta.post_id = orders.ID
+			WHERE order_meta.meta_key =  '_order_total'
+				AND orders.post_status = 'wc-processing'
+			GROUP BY order_meta.meta_key
+		"
+		);
+
+		if ( is_null( $processing_gross_total ) ) {
+			$processing_gross_total = 0;
 		}
 
-		if ( $processing_first !== $first_time ) {
-			$order_data['processing_first'] = gmdate( 'Y-m-d H:i:s', $processing_first );
+		return array(
+			'gross'            => $gross_total,
+			'processing_gross' => $processing_gross_total,
+		);
+	}
+
+	/**
+	 * Get last order date.
+	 *
+	 * @return string
+	 */
+	private static function get_order_dates() {
+		global $wpdb;
+
+		$min_max = $wpdb->get_row(
+			"
+			SELECT
+				MIN( post_date_gmt ) as 'first', MAX( post_date_gmt ) as 'last'
+			FROM {$wpdb->prefix}posts
+			WHERE post_type = 'shop_order'
+			AND post_status = 'wc-completed'
+		",
+			ARRAY_A
+		);
+
+		if ( is_null( $min_max ) ) {
+			$min_max = array(
+				'first' => '-',
+				'last'  => '-',
+			);
 		}
 
-		if ( $last ) {
-			$order_data['last'] = gmdate( 'Y-m-d H:i:s', $last );
+		$processing_min_max = $wpdb->get_row(
+			"
+			SELECT
+				MIN( post_date_gmt ) as 'processing_first', MAX( post_date_gmt ) as 'processing_last'
+			FROM {$wpdb->prefix}posts
+			WHERE post_type = 'shop_order'
+			AND post_status = 'wc-processing'
+		",
+			ARRAY_A
+		);
+
+		if ( is_null( $processing_min_max ) ) {
+			$processing_min_max = array(
+				'processing_first' => '-',
+				'processing_last'  => '-',
+			);
 		}
 
-		if ( $processing_last ) {
-			$order_data['processing_last']  = gmdate( 'Y-m-d H:i:s', $processing_last );
+		return array_merge( $min_max, $processing_min_max );
+	}
+
+	/**
+	 * Get order details by gateway.
+	 *
+	 * @return array
+	 */
+	private static function get_orders_by_gateway() {
+		global $wpdb;
+
+		$orders_by_gateway = $wpdb->get_results(
+			"
+			SELECT
+				gateway, currency, SUM(total) AS totals, COUNT(order_id) AS counts
+			FROM (
+				SELECT
+					orders.id AS order_id,
+					MAX(CASE WHEN meta_key = '_payment_method' THEN meta_value END) gateway,
+					MAX(CASE WHEN meta_key = '_order_total' THEN meta_value END) total,
+					MAX(CASE WHEN meta_key = '_order_currency' THEN meta_value END) currency
+				FROM
+					{$wpdb->prefix}posts orders
+				LEFT JOIN
+					{$wpdb->prefix}postmeta order_meta ON order_meta.post_id = orders.id
+				WHERE orders.post_type = 'shop_order'
+					AND orders.post_status in ( 'wc-completed', 'wc-processing', 'wc-refunded' )
+					AND meta_key in( '_payment_method','_order_total','_order_currency')
+				GROUP BY orders.id
+			) order_gateways
+			GROUP BY gateway, currency
+			"
+		);
+
+		$orders_by_gateway_currency = array();
+		foreach ( $orders_by_gateway as $orders_details ) {
+			$gateway  = 'gateway_' . $orders_details->gateway;
+			$currency = $orders_details->currency;
+			$count    = $gateway . '_' . $currency . '_count';
+			$total    = $gateway . '_' . $currency . '_total';
+
+			$orders_by_gateway_currency[ $count ] = $orders_details->counts;
+			$orders_by_gateway_currency[ $total ] = $orders_details->totals;
 		}
 
-		foreach ( $order_data as $key => $value ) {
-			$order_data[ $key ] = (string) $value;
-		}
-
-		return $order_data;
+		return $orders_by_gateway_currency;
 	}
 
 	/**
@@ -635,17 +683,6 @@ class WC_Tracker {
 		return array_filter( (array) get_option( 'woocommerce_tracker_ua', array() ) );
 	}
 
-	/**
-	 * Get order totals
-	 *
-	 * @deprecated 5.1.0 Logic moved to get_orders.
-	 * @return array
-	 */
-	public static function get_order_totals() {
-		wc_deprecated_function( 'WC_Tracker::get_order_totals', '5.1.0', '' );
-		return self::get_orders();
-	}
-
 	/**
 	 * Search a specific post for text content.
 	 *
diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php
index b25315cbcf6..e4586ebbf66 100644
--- a/includes/class-woocommerce.php
+++ b/includes/class-woocommerce.php
@@ -9,6 +9,8 @@
 defined( 'ABSPATH' ) || exit;
 
 use Automattic\WooCommerce\Internal\DownloadPermissionsAdjuster;
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 
 /**
@@ -206,6 +208,8 @@ final class WooCommerce {
 
 		// These classes set up hooks on instantiation.
 		wc_get_container()->get( DownloadPermissionsAdjuster::class );
+		wc_get_container()->get( AssignDefaultCategory::class );
+		wc_get_container()->get( DataRegenerator::class );
 	}
 
 	/**
diff --git a/includes/customizer/class-wc-shop-customizer.php b/includes/customizer/class-wc-shop-customizer.php
index 2d633188612..bf86e7f9e55 100644
--- a/includes/customizer/class-wc-shop-customizer.php
+++ b/includes/customizer/class-wc-shop-customizer.php
@@ -6,6 +6,8 @@
  * @package WooCommerce
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -13,10 +15,19 @@ defined( 'ABSPATH' ) || exit;
  */
 class WC_Shop_Customizer {
 
+	/**
+	 * Holds the instance of ThemeSupport to use.
+	 *
+	 * @var ThemeSupport $theme_support The instance of ThemeSupport to use.
+	 */
+	private $theme_support;
+
 	/**
 	 * Constructor.
 	 */
 	public function __construct() {
+		$this->theme_support = wc_get_container()->get( ThemeSupport::class );
+
 		add_action( 'customize_register', array( $this, 'add_sections' ) );
 		add_action( 'customize_controls_print_styles', array( $this, 'add_styles' ) );
 		add_action( 'customize_controls_print_scripts', array( $this, 'add_scripts' ), 30 );
@@ -117,7 +128,7 @@ class WC_Shop_Customizer {
 				} );
 
 				wp.customize.bind( 'ready', function() { // Ready?
-					$( '.woocommerce-cropping-control' ).find( 'input:checked' ).change();
+					$( '.woocommerce-cropping-control' ).find( 'input:checked' ).trigger( 'change' );
 				} );
 
 				wp.customize( 'woocommerce_demo_store', function( setting ) {
@@ -545,11 +556,11 @@ class WC_Shop_Customizer {
 			)
 		);
 
-		if ( ! wc_get_theme_support( 'single_image_width' ) ) {
+		if ( ! $this->theme_support->has_option( 'single_image_width', false ) ) {
 			$wp_customize->add_setting(
 				'woocommerce_single_image_width',
 				array(
-					'default'              => 600,
+					'default'              => $this->theme_support->get_option( 'single_image_width', 600 ),
 					'type'                 => 'option',
 					'capability'           => 'manage_woocommerce',
 					'sanitize_callback'    => 'absint',
@@ -573,11 +584,11 @@ class WC_Shop_Customizer {
 			);
 		}
 
-		if ( ! wc_get_theme_support( 'thumbnail_image_width' ) ) {
+		if ( ! $this->theme_support->has_option( 'thumbnail_image_width', false ) ) {
 			$wp_customize->add_setting(
 				'woocommerce_thumbnail_image_width',
 				array(
-					'default'              => 300,
+					'default'              => $this->theme_support->get_option( 'thumbnail_image_width', 300 ),
 					'type'                 => 'option',
 					'capability'           => 'manage_woocommerce',
 					'sanitize_callback'    => 'absint',
@@ -769,7 +780,7 @@ class WC_Shop_Customizer {
 			);
 		} else {
 			$choose_pages = array(
-				'woocommerce_terms_page_id'  => __( 'Terms and conditions', 'woocommerce' ),
+				'woocommerce_terms_page_id' => __( 'Terms and conditions', 'woocommerce' ),
 			);
 		}
 		$pages        = get_pages(
diff --git a/includes/data-stores/class-wc-customer-data-store-session.php b/includes/data-stores/class-wc-customer-data-store-session.php
index 4a2585d20ca..9b5d66ad4f9 100644
--- a/includes/data-stores/class-wc-customer-data-store-session.php
+++ b/includes/data-stores/class-wc-customer-data-store-session.php
@@ -126,12 +126,13 @@ class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Cust
 	protected function set_defaults( &$customer ) {
 		try {
 			$default = wc_get_customer_default_location();
+			$has_shipping_address = $customer->has_shipping_address();
 
 			if ( ! $customer->get_billing_country() ) {
 				$customer->set_billing_country( $default['country'] );
 			}
 
-			if ( ! $customer->get_shipping_country() ) {
+			if ( ! $customer->get_shipping_country() && ! $has_shipping_address ) {
 				$customer->set_shipping_country( $customer->get_billing_country() );
 			}
 
@@ -139,7 +140,7 @@ class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Cust
 				$customer->set_billing_state( $default['state'] );
 			}
 
-			if ( ! $customer->get_shipping_state() ) {
+			if ( ! $customer->get_shipping_state() && ! $has_shipping_address ) {
 				$customer->set_shipping_state( $customer->get_billing_state() );
 			}
 
diff --git a/includes/emails/class-wc-email.php b/includes/emails/class-wc-email.php
index d5accd8347a..91c0582d9ba 100644
--- a/includes/emails/class-wc-email.php
+++ b/includes/emails/class-wc-email.php
@@ -600,7 +600,8 @@ class WC_Email extends WC_Settings_API {
 	 * @return string
 	 */
 	public function get_content_plain() {
-		return ''; }
+		return '';
+	}
 
 	/**
 	 * Get the email content in HTML format.
@@ -608,7 +609,8 @@ class WC_Email extends WC_Settings_API {
 	 * @return string
 	 */
 	public function get_content_html() {
-		return ''; }
+		return '';
+	}
 
 	/**
 	 * Get the from name for outgoing emails.
@@ -1029,7 +1031,7 @@ class WC_Email extends WC_Settings_API {
 
 			<?php
 			wc_enqueue_js(
-				"jQuery( 'select.email_type' ).change( function() {
+				"jQuery( 'select.email_type' ).on( 'change', function() {
 
 					var val = jQuery( this ).val();
 
@@ -1043,7 +1045,7 @@ class WC_Email extends WC_Settings_API {
 						jQuery('.template_plain').hide();
 					}
 
-				}).change();
+				}).trigger( 'change' );
 
 				var view = '" . esc_js( __( 'View template', 'woocommerce' ) ) . "';
 				var hide = '" . esc_js( __( 'Hide template', 'woocommerce' ) ) . "';
@@ -1067,7 +1069,7 @@ class WC_Email extends WC_Settings_API {
 					return false;
 				});
 
-				jQuery( '.editor textarea' ).change( function() {
+				jQuery( '.editor textarea' ).on( 'change', function() {
 					var name = jQuery( this ).attr( 'data-name' );
 
 					if ( name ) {
diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php
index 3ec175dfd59..b93dd40316f 100644
--- a/includes/gateways/bacs/class-wc-gateway-bacs.php
+++ b/includes/gateways/bacs/class-wc-gateway-bacs.php
@@ -37,7 +37,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
 		$this->icon               = apply_filters( 'woocommerce_bacs_icon', '' );
 		$this->has_fields         = false;
 		$this->method_title       = __( 'Direct bank transfer', 'woocommerce' );
-		$this->method_description = __( 'Take payments in person via BACS. More commonly known as direct bank/wire transfer', 'woocommerce' );
+		$this->method_description = __( 'Take payments in person via BACS. More commonly known as direct bank/wire transfer.', 'woocommerce' );
 
 		// Load the settings.
 		$this->init_form_fields();
diff --git a/includes/gateways/cod/class-wc-gateway-cod.php b/includes/gateways/cod/class-wc-gateway-cod.php
index 33c17643bf0..f2bb24aa48e 100644
--- a/includes/gateways/cod/class-wc-gateway-cod.php
+++ b/includes/gateways/cod/class-wc-gateway-cod.php
@@ -132,7 +132,7 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
 			$order    = wc_get_order( $order_id );
 
 			// Test if order needs shipping.
-			if ( 0 < count( $order->get_items() ) ) {
+			if ( $order && 0 < count( $order->get_items() ) ) {
 				foreach ( $order->get_items() as $item ) {
 					$_product = $item->get_product();
 					if ( $_product && $_product->needs_shipping() ) {
diff --git a/includes/gateways/paypal/assets/js/paypal-admin.js b/includes/gateways/paypal/assets/js/paypal-admin.js
index 705d0aa193a..8fb28c3f059 100644
--- a/includes/gateways/paypal/assets/js/paypal-admin.js
+++ b/includes/gateways/paypal/assets/js/paypal-admin.js
@@ -38,7 +38,7 @@ jQuery( function( $ ) {
 				}
 			} );
 
-			$( '#woocommerce_paypal_testmode' ).change();
+			$( '#woocommerce_paypal_testmode' ).trigger( 'change' );
 		}
 	};
 
diff --git a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
index 19f212da2b6..4b8a1db0f4b 100644
--- a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
+++ b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
@@ -143,7 +143,7 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
 				'button' => __( 'Clean up download permissions', 'woocommerce' ),
 				'desc'   => __( 'This tool will delete expired download permissions and permissions with 0 remaining downloads.', 'woocommerce' ),
 			),
-			'regenerate_product_lookup_tables' => array(
+			'regenerate_product_lookup_tables'   => array(
 				'name'   => __( 'Product lookup tables', 'woocommerce' ),
 				'button' => __( 'Regenerate', 'woocommerce' ),
 				'desc'   => __( 'This tool will regenerate product lookup table data. This process may take a while.', 'woocommerce' ),
@@ -552,14 +552,14 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
 					$message = __( 'Template cache cleared.', 'woocommerce' );
 				} else {
 					$message = __( 'The active version of WooCommerce does not support template cache clearing.', 'woocommerce' );
-					$ran = false;
+					$ran     = false;
 				}
 				break;
 
 			case 'verify_db_tables':
 				if ( ! method_exists( 'WC_Install', 'verify_base_tables' ) ) {
 					$message = __( 'You need WooCommerce 4.2 or newer to run this tool.', 'woocommerce' );
-					$ran = false;
+					$ran     = false;
 					break;
 				}
 				// Try to manually create table again.
@@ -567,9 +567,9 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
 				if ( 0 === count( $missing_tables ) ) {
 					$message = __( 'Database verified successfully.', 'woocommerce' );
 				} else {
-					$message = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce' );
+					$message  = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce' );
 					$message .= implode( ', ', $missing_tables );
-					$ran = false;
+					$ran      = false;
 				}
 				break;
 
@@ -577,11 +577,35 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
 				$tools = $this->get_tools();
 				if ( isset( $tools[ $tool ]['callback'] ) ) {
 					$callback = $tools[ $tool ]['callback'];
-					$return   = call_user_func( $callback );
-					if ( is_string( $return ) ) {
+					try {
+						$return = call_user_func( $callback );
+					} catch ( Exception $exception ) {
+						$return = $exception;
+					}
+					if ( is_a( $return, Exception::class ) ) {
+						$callback_string = $this->get_printable_callback_name( $callback, $tool );
+						$ran             = false;
+						/* translators: %1$s: callback string, %2$s: error message */
+						$message = sprintf( __( 'There was an error calling %1$s: %2$s', 'woocommerce' ), $callback_string, $return->getMessage() );
+
+						$logger = wc_get_logger();
+						$logger->error(
+							sprintf(
+								'Error running debug tool %s: %s',
+								$tool,
+								$return->getMessage()
+							),
+							array(
+								'source'   => 'run-debug-tool',
+								'tool'     => $tool,
+								'callback' => $callback,
+								'error'    => $return,
+							)
+						);
+					} elseif ( is_string( $return ) ) {
 						$message = $return;
 					} elseif ( false === $return ) {
-						$callback_string = is_array( $callback ) ? get_class( $callback[0] ) . '::' . $callback[1] : $callback;
+						$callback_string = $this->get_printable_callback_name( $callback, $tool );
 						$ran             = false;
 						/* translators: %s: callback string */
 						$message = sprintf( __( 'There was an error calling %s', 'woocommerce' ), $callback_string );
@@ -600,4 +624,22 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
 			'message' => $message,
 		);
 	}
+
+	/**
+	 * Get a printable name for a callback.
+	 *
+	 * @param mixed  $callback The callback to get a name for.
+	 * @param string $default The default name, to be returned when the callback is an inline function.
+	 * @return string A printable name for the callback.
+	 */
+	private function get_printable_callback_name( $callback, $default ) {
+		if ( is_array( $callback ) ) {
+			return get_class( $callback[0] ) . '::' . $callback[1];
+		}
+		if ( is_string( $callback ) ) {
+			return $callback;
+		}
+
+		return $default;
+	}
 }
diff --git a/includes/rest-api/Controllers/Version3/class-wc-rest-crud-controller.php b/includes/rest-api/Controllers/Version3/class-wc-rest-crud-controller.php
index 2767221e7ef..2ebf47a1eab 100644
--- a/includes/rest-api/Controllers/Version3/class-wc-rest-crud-controller.php
+++ b/includes/rest-api/Controllers/Version3/class-wc-rest-crud-controller.php
@@ -300,6 +300,13 @@ abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
 			$args['date_query'][0]['after'] = $request['after'];
 		}
 
+		// Check flag to use post_date vs post_date_gmt.
+		if ( true === $request['dates_are_gmt'] ) {
+			if ( isset( $request['before'] ) || isset( $request['after'] ) ) {
+				$args['date_query']['column'] = 'post_date_gmt';
+			}
+		}
+
 		// Force the post_type argument, since it's not a user input variable.
 		$args['post_type'] = $this->post_type;
 
@@ -562,6 +569,12 @@ abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
 			'format'             => 'date-time',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
+		$params['dates_are_gmt'] = array(
+			'description'       => __( 'Whether to use GMT post dates.', 'woocommerce' ),
+			'type'              => 'boolean',
+			'default'           => false,
+			'validate_callback' => 'rest_validate_request_arg',
+		);
 		$params['exclude'] = array(
 			'description'       => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
 			'type'              => 'array',
diff --git a/includes/rest-api/Controllers/Version3/class-wc-rest-terms-controller.php b/includes/rest-api/Controllers/Version3/class-wc-rest-terms-controller.php
index f434ef60b00..40423decb89 100644
--- a/includes/rest-api/Controllers/Version3/class-wc-rest-terms-controller.php
+++ b/includes/rest-api/Controllers/Version3/class-wc-rest-terms-controller.php
@@ -10,6 +10,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+
 /**
  * Terms controller class.
  */
@@ -563,6 +565,9 @@ abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
 			return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'The resource cannot be deleted.', 'woocommerce' ), array( 'status' => 500 ) );
 		}
 
+		// Schedule action to assign default category.
+		wc_get_container()->get( AssignDefaultCategory::class )->schedule_action();
+
 		/**
 		 * Fires after a single term is deleted via the REST API.
 		 *
diff --git a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
index fc630e67a61..00d813f6d24 100644
--- a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
+++ b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
@@ -233,7 +233,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
 				});
 
 				// Change while load.
-				$( '#woocommerce_free_shipping_requires' ).change();
+				$( '#woocommerce_free_shipping_requires' ).trigger( 'change' );
 				$( document.body ).on( 'wc_backbone_modal_loaded', function( evt, target ) {
 					if ( 'wc-modal-shipping-method-settings' === target ) {
 						wcFreeShippingShowHideMinAmountField( $( '#wc-backbone-modal-dialog #woocommerce_free_shipping_requires', evt.currentTarget ) );
diff --git a/includes/theme-support/class-wc-twenty-eleven.php b/includes/theme-support/class-wc-twenty-eleven.php
index fb06a7a84dc..db598f78907 100644
--- a/includes/theme-support/class-wc-twenty-eleven.php
+++ b/includes/theme-support/class-wc-twenty-eleven.php
@@ -6,6 +6,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -29,8 +31,7 @@ class WC_Twenty_Eleven {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 150,
 				'single_image_width'    => 300,
diff --git a/includes/theme-support/class-wc-twenty-fifteen.php b/includes/theme-support/class-wc-twenty-fifteen.php
index 83e1930cf93..a3a194c7579 100644
--- a/includes/theme-support/class-wc-twenty-fifteen.php
+++ b/includes/theme-support/class-wc-twenty-fifteen.php
@@ -7,6 +7,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -30,8 +32,7 @@ class WC_Twenty_Fifteen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 200,
 				'single_image_width'    => 350,
diff --git a/includes/theme-support/class-wc-twenty-fourteen.php b/includes/theme-support/class-wc-twenty-fourteen.php
index ce04395299d..b8f5cf09a6b 100644
--- a/includes/theme-support/class-wc-twenty-fourteen.php
+++ b/includes/theme-support/class-wc-twenty-fourteen.php
@@ -7,6 +7,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -30,8 +32,7 @@ class WC_Twenty_Fourteen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 150,
 				'single_image_width'    => 300,
diff --git a/includes/theme-support/class-wc-twenty-nineteen.php b/includes/theme-support/class-wc-twenty-nineteen.php
index 47c1aff660c..5419ade5b0a 100644
--- a/includes/theme-support/class-wc-twenty-nineteen.php
+++ b/includes/theme-support/class-wc-twenty-nineteen.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -37,8 +38,7 @@ class WC_Twenty_Nineteen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 300,
 				'single_image_width'    => 450,
@@ -48,7 +48,7 @@ class WC_Twenty_Nineteen {
 		// Tweak Twenty Nineteen features.
 		add_action( 'wp', array( __CLASS__, 'tweak_theme_features' ) );
 
-		// Color scheme CSS
+		// Color scheme CSS.
 		add_filter( 'twentynineteen_custom_colors_css', array( __CLASS__, 'custom_colors_css' ), 10, 3 );
 	}
 
diff --git a/includes/theme-support/class-wc-twenty-seventeen.php b/includes/theme-support/class-wc-twenty-seventeen.php
index 2093d2200e7..661121063a5 100644
--- a/includes/theme-support/class-wc-twenty-seventeen.php
+++ b/includes/theme-support/class-wc-twenty-seventeen.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -30,8 +31,7 @@ class WC_Twenty_Seventeen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 250,
 				'single_image_width'    => 350,
diff --git a/includes/theme-support/class-wc-twenty-sixteen.php b/includes/theme-support/class-wc-twenty-sixteen.php
index c9681fa5e98..f78fbb634f5 100644
--- a/includes/theme-support/class-wc-twenty-sixteen.php
+++ b/includes/theme-support/class-wc-twenty-sixteen.php
@@ -6,6 +6,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -29,8 +31,7 @@ class WC_Twenty_Sixteen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 250,
 				'single_image_width'    => 400,
diff --git a/includes/theme-support/class-wc-twenty-ten.php b/includes/theme-support/class-wc-twenty-ten.php
index 8a9262e6191..4988aea16a4 100644
--- a/includes/theme-support/class-wc-twenty-ten.php
+++ b/includes/theme-support/class-wc-twenty-ten.php
@@ -6,6 +6,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -29,8 +31,7 @@ class WC_Twenty_Ten {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 200,
 				'single_image_width'    => 300,
diff --git a/includes/theme-support/class-wc-twenty-thirteen.php b/includes/theme-support/class-wc-twenty-thirteen.php
index 4e80b3e27c6..527fa176ee0 100644
--- a/includes/theme-support/class-wc-twenty-thirteen.php
+++ b/includes/theme-support/class-wc-twenty-thirteen.php
@@ -7,6 +7,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -30,8 +32,7 @@ class WC_Twenty_Thirteen {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 200,
 				'single_image_width'    => 300,
diff --git a/includes/theme-support/class-wc-twenty-twelve.php b/includes/theme-support/class-wc-twenty-twelve.php
index 116dabea432..3815ac4c26d 100644
--- a/includes/theme-support/class-wc-twenty-twelve.php
+++ b/includes/theme-support/class-wc-twenty-twelve.php
@@ -7,6 +7,8 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -30,8 +32,7 @@ class WC_Twenty_Twelve {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 200,
 				'single_image_width'    => 300,
diff --git a/includes/theme-support/class-wc-twenty-twenty-one.php b/includes/theme-support/class-wc-twenty-twenty-one.php
index 6b568ae0e2d..7707c05ecd5 100644
--- a/includes/theme-support/class-wc-twenty-twenty-one.php
+++ b/includes/theme-support/class-wc-twenty-twenty-one.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -37,8 +38,7 @@ class WC_Twenty_Twenty_One {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 450,
 				'single_image_width'    => 600,
diff --git a/includes/theme-support/class-wc-twenty-twenty.php b/includes/theme-support/class-wc-twenty-twenty.php
index 47296f639ab..862376f9eda 100644
--- a/includes/theme-support/class-wc-twenty-twenty.php
+++ b/includes/theme-support/class-wc-twenty-twenty.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -37,8 +38,7 @@ class WC_Twenty_Twenty {
 		add_theme_support( 'wc-product-gallery-zoom' );
 		add_theme_support( 'wc-product-gallery-lightbox' );
 		add_theme_support( 'wc-product-gallery-slider' );
-		add_theme_support(
-			'woocommerce',
+		wc_get_container()->get( ThemeSupport::class )->add_default_options(
 			array(
 				'thumbnail_image_width' => 450,
 				'single_image_width'    => 600,
diff --git a/includes/tracks/class-wc-site-tracking.php b/includes/tracks/class-wc-site-tracking.php
index 74e06215985..e924d250448 100644
--- a/includes/tracks/class-wc-site-tracking.php
+++ b/includes/tracks/class-wc-site-tracking.php
@@ -104,7 +104,7 @@ class WC_Site_Tracking {
 
 		?>
 		<script type="text/javascript">
-			window.wcTracks.enable = function( callback = null ) {
+			window.wcTracks.enable = function( callback ) {
 				window.wcTracks.isEnabled = true;
 
 				var scriptUrl = '<?php echo esc_url( $woo_tracks_script ); ?>';
diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php
index 6564d77f698..3ffb94d5d6e 100644
--- a/includes/wc-core-functions.php
+++ b/includes/wc-core-functions.php
@@ -9,6 +9,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Internal\ThemeSupport;
 use Automattic\WooCommerce\Utilities\NumberUtil;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -390,7 +391,7 @@ function wc_locate_template( $template_name, $template_path = '', $default_path
 	// Look within passed path within the theme - this is priority.
 	if ( false !== strpos( $template_name, 'product_cat' ) || false !== strpos( $template_name, 'product_tag' ) ) {
 		$cs_template = str_replace( '_', '-', $template_name );
-		$template = locate_template(
+		$template    = locate_template(
 			array(
 				trailingslashit( $template_path ) . $cs_template,
 				$cs_template,
@@ -879,38 +880,7 @@ function wc_mail( $to, $subject, $message, $headers = "Content-Type: text/html\r
  * @return mixed  Value of prop(s).
  */
 function wc_get_theme_support( $prop = '', $default = null ) {
-	$theme_support = get_theme_support( 'woocommerce' );
-	$theme_support = is_array( $theme_support ) ? $theme_support[0] : false;
-
-	if ( ! $theme_support ) {
-		return $default;
-	}
-
-	if ( $prop ) {
-		$prop_stack = explode( '::', $prop );
-		$prop_key   = array_shift( $prop_stack );
-
-		if ( isset( $theme_support[ $prop_key ] ) ) {
-			$value = $theme_support[ $prop_key ];
-
-			if ( count( $prop_stack ) ) {
-				foreach ( $prop_stack as $prop_key ) {
-					if ( is_array( $value ) && isset( $value[ $prop_key ] ) ) {
-						$value = $value[ $prop_key ];
-					} else {
-						$value = $default;
-						break;
-					}
-				}
-			}
-		} else {
-			$value = $default;
-		}
-
-		return $value;
-	}
-
-	return $theme_support;
+	return wc_get_container()->get( ThemeSupport::class )->get_option( $prop, $default );
 }
 
 /**
@@ -1270,7 +1240,7 @@ function wc_format_country_state_string( $country_string ) {
  * @return array
  */
 function wc_get_base_location() {
-	$default = apply_filters( 'woocommerce_get_base_location', get_option( 'woocommerce_default_country' ) );
+	$default = apply_filters( 'woocommerce_get_base_location', get_option( 'woocommerce_default_country', 'US:CA' ) );
 
 	return wc_format_country_state_string( $default );
 }
@@ -1286,7 +1256,7 @@ function wc_get_base_location() {
  */
 function wc_get_customer_default_location() {
 	$set_default_location_to = get_option( 'woocommerce_default_customer_address', 'base' );
-	$default_location        = '' === $set_default_location_to ? '' : get_option( 'woocommerce_default_country', '' );
+	$default_location        = '' === $set_default_location_to ? '' : get_option( 'woocommerce_default_country', 'US:CA' );
 	$location                = wc_format_country_state_string( apply_filters( 'woocommerce_customer_default_location', $default_location ) );
 
 	// Geolocation takes priority if used and if geolocation is possible.
@@ -1851,7 +1821,7 @@ function wc_get_tax_rounding_mode() {
 	$constant = WC_TAX_ROUNDING_MODE;
 
 	if ( 'auto' === $constant ) {
-		return 'yes' === get_option( 'woocommerce_prices_include_tax', 'no' ) ? 2 : 1;
+		return 'yes' === get_option( 'woocommerce_prices_include_tax', 'no' ) ? PHP_ROUND_HALF_DOWN : PHP_ROUND_HALF_UP;
 	}
 
 	return intval( $constant );
@@ -2269,9 +2239,9 @@ function wc_prevent_dangerous_auto_updates( $should_update, $plugin ) {
 		include_once dirname( __FILE__ ) . '/admin/plugin-updates/class-wc-plugin-updates.php';
 	}
 
-	$new_version      = wc_clean( $plugin->new_version );
-	$plugin_updates   = new WC_Plugin_Updates();
-	$version_type = Constants::get_constant( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE' );
+	$new_version    = wc_clean( $plugin->new_version );
+	$plugin_updates = new WC_Plugin_Updates();
+	$version_type   = Constants::get_constant( 'WC_SSR_PLUGIN_UPDATE_RELEASE_VERSION_TYPE' );
 	if ( ! is_string( $version_type ) ) {
 		$version_type = 'none';
 	}
@@ -2443,7 +2413,7 @@ function wc_round_discount( $value, $precision ) {
 		return NumberUtil::round( $value, $precision, WC_DISCOUNT_ROUNDING_MODE ); // phpcs:ignore PHPCompatibility.FunctionUse.NewFunctionParameters.round_modeFound
 	}
 
-	if ( 2 === WC_DISCOUNT_ROUNDING_MODE ) {
+	if ( PHP_ROUND_HALF_DOWN === WC_DISCOUNT_ROUNDING_MODE ) {
 		return wc_legacy_round_half_down( $value, $precision );
 	}
 
diff --git a/includes/wc-formatting-functions.php b/includes/wc-formatting-functions.php
index a48b3df5937..264ad8fd62b 100644
--- a/includes/wc-formatting-functions.php
+++ b/includes/wc-formatting-functions.php
@@ -1265,7 +1265,7 @@ function wc_format_stock_quantity_for_display( $stock_quantity, $product ) {
  * @return string
  */
 function wc_format_sale_price( $regular_price, $sale_price ) {
-	$price = '<del>' . ( is_numeric( $regular_price ) ? wc_price( $regular_price ) : $regular_price ) . '</del> <ins>' . ( is_numeric( $sale_price ) ? wc_price( $sale_price ) : $sale_price ) . '</ins>';
+	$price = '<del aria-hidden="true">' . ( is_numeric( $regular_price ) ? wc_price( $regular_price ) : $regular_price ) . '</del> <ins>' . ( is_numeric( $sale_price ) ? wc_price( $sale_price ) : $sale_price ) . '</ins>';
 	return apply_filters( 'woocommerce_format_sale_price', $price, $regular_price, $sale_price );
 }
 
diff --git a/includes/wc-stock-functions.php b/includes/wc-stock-functions.php
index 70b268836d5..f8fc3d557ff 100644
--- a/includes/wc-stock-functions.php
+++ b/includes/wc-stock-functions.php
@@ -403,7 +403,7 @@ function wc_get_low_stock_amount( WC_Product $product ) {
 	$low_stock_amount = $product->get_low_stock_amount();
 
 	if ( '' === $low_stock_amount && $product->is_type( 'variation' ) ) {
-		$product = wc_get_product( $product->get_parent_id() );
+		$product          = wc_get_product( $product->get_parent_id() );
 		$low_stock_amount = $product->get_low_stock_amount();
 	}
 
@@ -411,5 +411,5 @@ function wc_get_low_stock_amount( WC_Product $product ) {
 		$low_stock_amount = get_option( 'woocommerce_notify_low_stock_amount', 2 );
 	}
 
-	return $low_stock_amount;
+	return (int) $low_stock_amount;
 }
diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php
index 43597440f1c..dd40a5f805e 100644
--- a/includes/wc-template-functions.php
+++ b/includes/wc-template-functions.php
@@ -887,7 +887,7 @@ function wc_terms_and_conditions_page_content() {
 	$page = get_post( $terms_page_id );
 
 	if ( $page && 'publish' === $page->post_status && $page->post_content && ! has_shortcode( $page->post_content, 'woocommerce_checkout' ) ) {
-		echo '<div class="woocommerce-terms-and-conditions" style="display: none; max-height: 200px; overflow: auto;">' . wp_kses_post( wc_format_content( $page->post_content ) ) . '</div>';
+		echo '<div class="woocommerce-terms-and-conditions" style="display: none; max-height: 200px; overflow: auto;">' . wc_format_content( wp_kses_post( $page->post_content ) ) . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 }
 
@@ -1240,8 +1240,7 @@ if ( ! function_exists( 'woocommerce_taxonomy_archive_description' ) ) {
 			$term = get_queried_object();
 
 			if ( $term && ! empty( $term->description ) ) {
-				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				echo '<div class="term-description">' . wc_format_content( $term->description ) . '</div>';
+				echo '<div class="term-description">' . wc_format_content( wp_kses_post( $term->description ) ) . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 		}
 	}
@@ -1260,10 +1259,9 @@ if ( ! function_exists( 'woocommerce_product_archive_description' ) ) {
 		if ( is_post_type_archive( 'product' ) && in_array( absint( get_query_var( 'paged' ) ), array( 0, 1 ), true ) ) {
 			$shop_page = get_post( wc_get_page_id( 'shop' ) );
 			if ( $shop_page ) {
-				$description = wc_format_content( $shop_page->post_content );
+				$description = wc_format_content( wp_kses_post( $shop_page->post_content ) );
 				if ( $description ) {
-					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					echo '<div class="page-description">' . $description . '</div>';
+					echo '<div class="page-description">' . $description . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 				}
 			}
 		}
@@ -2755,8 +2753,9 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 					$field .= '<input type="hidden" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="' . current( array_keys( $countries ) ) . '" ' . implode( ' ', $custom_attributes ) . ' class="country_to_state" readonly="readonly" />';
 
 				} else {
+					$data_label = ! empty( $args['label'] ) ? 'data-label="' . esc_attr( $args['label'] ) . '"' : '';
 
-					$field = '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="country_to_state country_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ? $args['placeholder'] : esc_attr__( 'Select a country / region&hellip;', 'woocommerce' ) ) . '"><option value="">' . esc_html__( 'Select a country / region&hellip;', 'woocommerce' ) . '</option>';
+					$field = '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="country_to_state country_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ? $args['placeholder'] : esc_attr__( 'Select a country / region&hellip;', 'woocommerce' ) ) . '" ' . $data_label . '><option value="">' . esc_html__( 'Select a country / region&hellip;', 'woocommerce' ) . '</option>';
 
 					foreach ( $countries as $ckey => $cvalue ) {
 						$field .= '<option value="' . esc_attr( $ckey ) . '" ' . selected( $value, $ckey, false ) . '>' . esc_html( $cvalue ) . '</option>';
@@ -2781,8 +2780,9 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 					$field .= '<input type="hidden" class="hidden" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" value="" ' . implode( ' ', $custom_attributes ) . ' placeholder="' . esc_attr( $args['placeholder'] ) . '" readonly="readonly" data-input-classes="' . esc_attr( implode( ' ', $args['input_class'] ) ) . '"/>';
 
 				} elseif ( ! is_null( $for_country ) && is_array( $states ) ) {
+					$data_label = ! empty( $args['label'] ) ? 'data-label="' . esc_attr( $args['label'] ) . '"' : '';
 
-					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="state_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ? $args['placeholder'] : esc_html__( 'Select an option&hellip;', 'woocommerce' ) ) . '"  data-input-classes="' . esc_attr( implode( ' ', $args['input_class'] ) ) . '">
+					$field .= '<select name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" class="state_select ' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . implode( ' ', $custom_attributes ) . ' data-placeholder="' . esc_attr( $args['placeholder'] ? $args['placeholder'] : esc_html__( 'Select an option&hellip;', 'woocommerce' ) ) . '"  data-input-classes="' . esc_attr( implode( ' ', $args['input_class'] ) ) . '" ' . $data_label . '>
 						<option value="">' . esc_html__( 'Select an option&hellip;', 'woocommerce' ) . '</option>';
 
 					foreach ( $states as $ckey => $cvalue ) {
diff --git a/includes/wc-term-functions.php b/includes/wc-term-functions.php
index c6fd42ab966..163a1e476c8 100644
--- a/includes/wc-term-functions.php
+++ b/includes/wc-term-functions.php
@@ -486,7 +486,8 @@ function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_
 		$term_query['join'] .= " INNER JOIN ( SELECT object_id FROM {$wpdb->term_relationships} INNER JOIN {$wpdb->term_taxonomy} using( term_taxonomy_id ) WHERE term_id IN ( " . implode( ',', array_map( 'absint', $terms_to_count ) ) . ' ) ) AS include_join ON include_join.object_id = p.ID';
 
 		// Get the count.
-		$count = $wpdb->get_var( implode( ' ', $term_query ) ); // WPCS: unprepared SQL ok.
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$count = $wpdb->get_var( implode( ' ', $term_query ) );
 
 		// Update the count.
 		update_term_meta( $term_id, 'product_count_' . $taxonomy->name, absint( $count ) );
diff --git a/includes/wc-update-functions.php b/includes/wc-update-functions.php
index 439095d5482..afefd264c5a 100644
--- a/includes/wc-update-functions.php
+++ b/includes/wc-update-functions.php
@@ -10,6 +10,8 @@
 
 defined( 'ABSPATH' ) || exit;
 
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+
 /**
  * Update file paths for 2.0
  *
@@ -1567,31 +1569,12 @@ function wc_update_330_webhooks() {
  * Assign default cat to all products with no cats.
  */
 function wc_update_330_set_default_product_cat() {
-	global $wpdb;
-
-	$default_category = get_option( 'default_product_cat', 0 );
-
-	if ( $default_category ) {
-		$wpdb->query(
-			$wpdb->prepare(
-				"INSERT INTO {$wpdb->term_relationships} (object_id, term_taxonomy_id)
-				SELECT DISTINCT posts.ID, %s FROM {$wpdb->posts} posts
-				LEFT JOIN
-					(
-						SELECT object_id FROM {$wpdb->term_relationships} term_relationships
-						LEFT JOIN {$wpdb->term_taxonomy} term_taxonomy ON term_relationships.term_taxonomy_id = term_taxonomy.term_taxonomy_id
-						WHERE term_taxonomy.taxonomy = 'product_cat'
-					) AS tax_query
-				ON posts.ID = tax_query.object_id
-				WHERE posts.post_type = 'product'
-				AND tax_query.object_id IS NULL",
-				$default_category
-			)
-		);
-		wp_cache_flush();
-		delete_transient( 'wc_term_counts' );
-		wp_update_term_count_now( array( $default_category ), 'product_cat' );
-	}
+	/*
+	 * When a product category is deleted, we need to check
+	 * if the product has no categories assigned. Then assign
+	 * it a default category.
+	 */
+	wc_get_container()->get( AssignDefaultCategory::class )->maybe_assign_default_product_cat();
 }
 
 /**
diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php
index 1ad76f4d633..e72711f175d 100644
--- a/includes/widgets/class-wc-widget-layered-nav.php
+++ b/includes/widgets/class-wc-widget-layered-nav.php
@@ -252,7 +252,7 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 			if ( '' === get_option( 'permalink_structure' ) ) {
 				$form_action = remove_query_arg( array( 'page', 'paged' ), add_query_arg( $wp->query_string, '', home_url( $wp->request ) ) );
 			} else {
-				$form_action = preg_replace( '%\/page/[0-9]+%', '', home_url( trailingslashit( $wp->request ) ) );
+				$form_action = preg_replace( '%\/page/[0-9]+%', '', home_url( user_trailingslashit( $wp->request ) ) );
 			}
 
 			echo '<form method="get" action="' . esc_url( $form_action ) . '" class="woocommerce-widget-layered-nav-dropdown">';
@@ -297,13 +297,13 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 			wc_enqueue_js(
 				"
 				// Update value on change.
-				jQuery( '.dropdown_layered_nav_" . esc_js( $taxonomy_filter_name ) . "' ).change( function() {
+				jQuery( '.dropdown_layered_nav_" . esc_js( $taxonomy_filter_name ) . "' ).on( 'change', function() {
 					var slug = jQuery( this ).val();
 					jQuery( ':input[name=\"filter_" . esc_js( $taxonomy_filter_name ) . "\"]' ).val( slug );
 
 					// Submit form on change if standard dropdown.
 					if ( ! jQuery( this ).attr( 'multiple' ) ) {
-						jQuery( this ).closest( 'form' ).submit();
+						jQuery( this ).closest( 'form' ).trigger( 'submit' );
 					}
 				});
 
diff --git a/includes/widgets/class-wc-widget-product-categories.php b/includes/widgets/class-wc-widget-product-categories.php
index 26b590bcdf7..559cb13e3a3 100644
--- a/includes/widgets/class-wc-widget-product-categories.php
+++ b/includes/widgets/class-wc-widget-product-categories.php
@@ -245,7 +245,7 @@ class WC_Widget_Product_Categories extends WC_Widget {
 
 			wc_enqueue_js(
 				"
-				jQuery( '.dropdown_product_cat' ).change( function() {
+				jQuery( '.dropdown_product_cat' ).on( 'change', function() {
 					if ( jQuery(this).val() != '' ) {
 						var this_page = '';
 						var home_url  = '" . esc_js( home_url( '/' ) ) . "';
diff --git a/package-lock.json b/package-lock.json
index 2ec65648a08..0c5d1334562 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8919,7 +8919,8 @@
       "dev": true,
       "requires": {
         "@jest/globals": "^26.4.2",
-        "config": "3.3.3"
+        "config": "3.3.3",
+        "faker": "^5.1.0"
       },
       "dependencies": {
         "@jest/environment": {
@@ -9307,7 +9308,7 @@
               }
             },
             "prettier": {
-              "version": "npm:prettier@1.19.1",
+              "version": "npm:wp-prettier@1.19.1",
               "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-1.19.1.tgz",
               "integrity": "sha512-mqAC2r1NDmRjG+z3KCJ/i61tycKlmADIjxnDhQab+KBxSAGbF/W7/zwB2guy/ypIeKrrftNsIYkNZZQKf3vJcg==",
               "dev": true
@@ -25834,6 +25835,12 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
+    "faker": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "dev": true
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
diff --git a/package.json b/package.json
index ecbad3d716b..00559ae31f1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "woocommerce",
   "title": "WooCommerce",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "homepage": "https://woocommerce.com/",
   "repository": {
     "type": "git",
@@ -96,7 +96,7 @@
     "wp-textdomain": "1.0.1"
   },
   "engines": {
-    "node": "^10.22.0",
+    "node": "^12.20.1",
     "npm": "^6.14.6"
   },
   "husky": {
diff --git a/readme.txt b/readme.txt
index b230c7250c7..3a622af86bb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: e-commerce, store, sales, sell, woo, shop, cart, checkout, downloadable, d
 Requires at least: 5.5
 Tested up to: 5.7
 Requires PHP: 7.0
-Stable tag: 5.1.0
+Stable tag: 5.3.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -160,151 +160,135 @@ WooCommerce comes with some sample data you can use to see how products look; im
 
 == Changelog ==
 
-= 5.2.0 RC 2021-03-30 =
-
-* Update - WooCommerce Admin package 2.1.4. #29520
-* Fix - Don't remove existing coupons from order when an invalid REST API request for updating coupons is submitted. #29474
-* Fix - Wrong logic for including or excluding the payments step in the list of completed tasks in the onboarding wizard. #29518
-
-**WooCommerce Admin - 2.1.4**
-
-* Fix - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
-
-= 5.2.0 beta 2021-03-23 =
+= 5.3.0 2021-05-11 =
 
 **WooCommerce**
 
-* Update - WooCommerce Blocks package 4.7.0. #29406
-* Update - WooCommerce Admin package 2.1.3. #29283
-* Add - Filter woocommerce_product_recount_terms to allow/prevent recounting of product terms. #29281
-* Add - Result return array to the checkout_place_order_success callback to allow 3rd party to manipulate results. #29232
-* Dev - Fix miscellaneous typos in docblocks. #29285
-* Dev - Added woocommerce_ajax_order_items_removed hook. #29241
-* Dev - Fix usage of docker-compose (wc-e2e) commands in e2e tests when running them within WSL2. #29207
-* Dev - Fixes to documentation of WC_Shipping_Rate. #29117
-* Dev - Add tracks event when a user clicks on the links of the WooCommerce Status widget. #29109
-* Dev - Track the number of installations of WooCommerce Payments via that extensions banner for stores that have opted in to tracking. #29052
-* Dev - Added woocommerce_ajax_order_items_removed hook. #28936
-* Dev - Add tracking of woocommerce_admin_disabled usage. #28535
-* Enhancement - Add support for the low stock threshold for variations. #29345
-* Enhancement - Clean up of major version update compatibility warnings. #29200
-* Enhancement - Add a new dashboard widget to promote users to finish onboarding tasks. #29174
-* Enhancement - Update the Woo widget net sales link and logic to use the new analytics page and data. #29149
-* Enhancement - Added the body class woocommerce-shop to the shop page, so that it can be targeted via CSS. (#28724). #29051
-* Enhancement - Make sure downloadable file paths are properly recognized for strengthened security. #28699
-* Enhancement - Delay the registration of data exporters and erasers to avoid multiple language files from being loaded. #28078
-* Fix - Offsets not calculated correctly sometimes on select2 dropdowns causing usability issues. #29397
-* Fix - Handle errors in fault installations of PHP Intl. #29391
-* Fix - Cart page calculate shipping fields not showing correct fields based on location. #29282
-* Fix - Product categories widget item count not always showing the correct number. #29281
-* Fix - Updated include/rest-api/Controllers/Version3/class-wc-rest-shipping-zone-methods-controller.php to include a item schema function which appends support for order and class type values. #29218
-* Fix - Check if variation_id if belongs to the parent product while adding products to the cart. #29208
-* Fix - Reduce the number of ajax calls used when Geolocation (with Page Caching Enabled) mode is enabled. #29182
-* Fix - Don't display the coupon form on checkouts requiring the customer to be logged in to checkout. #29151
-* Fix - If coupon_lines are specified within a REST API order update, return an error if coupon item IDs are also specified. #29146
-* Fix - Avoids duplicating the word '(optional)' in the context of the Billing Address 2 field. #29136
-* Fix - PHP notice when checking out. #29133
-* Fix - Remove duplicate containers from the single and archive product pages. #29121
-* Fix - Wrong taxonomy caching in term and product attributes controllers. #29115
-* Fix - Make the parameters of the refund creation REST API behave as documented. #29099
-* Fix - Shipping methods with similar names could cause shipping method not selectable in order page. #29049
-* Fix - WC_Countries::get_formatted_address() not returning full name in correct order in some languages. #29008
-* Fix - add validation of the posted country codes on checkout. #28849
-* Fix - Correctly display pagination arrows on RTL languages. #28523
-* Fix - Invalid refund amount error on $0 refund when number of decimals is equal to 0. #27277
-* Fix - Revert a replacement of wp_redirect to wp_safe_redirect in WC_Checkout::process_order_payment that caused issues in the default PayPal interface. #29459
-* Fix - "Sale" badge misaligned on products when displaying 1 item per row. #29425
-* Tweak - Added the Mercado Pago logo into the assets/images folder in order to use it in the payments setup task. #29365
-* Tweak - Update the contributor guidelines. #29150
-* Tweak - Introduced phone number input validation. #27242
+* Dev - Add support for "cities" and "postcodes" fields to the REST API endpoints to create/update tax rates. #29495
+* Dev - The taxes GET endpoint now supports sorting by priority. #29495
+* Enhancement - Add a new `woocommerce_cart_product_not_enough_stock_already_in_cart_message` filter to allow developers to filter an add-to-cart error when there isn't enough in stock taking into account what's already in the cart. #29304
+* Enhancement - Pass `$handler`, and prevent logging from `woocommerce_logger_log_message` filter when the message is null. #29572
+* Fix - Added parameter `$item` (instance of WC_Order_Item) to both the function `wc_downloadable_file_permission` and the filter hook `woocommerce_downloadable_file_permission`. #23188
+* Fix - Add array-typed "cities" and "postcodes" to the response of the "tax" endpoint in the REST API to overcome the limitation of "city" and "postcode" returning always one single value. #27751
+* Fix - Update tax rate for existing taxes when recalculating order totals. #27985
+* Fix - Replace page setup dropdowns with AJAX powered search selects. #29181
+* Fix - Return 0 if order isn't available in `WC_Payment_Gateway::get_order_total()`. #29314
+* Fix - Fix console error on IE11 when opening admin pages. #29322
+* Fix - Prevent crash when log file can't be opened for writing. #29396
+* Fix - Closes the section "Store management insights" in email settings. #29447
+* Fix - Fixed return type of `WC_Shortcode_Products::get_type()`. #29452
+* Fix - Fix syntax error in the admin (products/orders) list table. #29469
+* Fix - Cart duplicate debug shipping notices in certain situations. #29480
+* Fix - Trying to update the cities or postcodes (only) or a tax rate via REST API returned an error. #29495
+* Fix - Unneeded browser popup message of unsaved changes when adding a shipping zone with a shipping method. #29510
+* Fix - Update the persistent cart after it's loaded on customer login. Fixes an issue whereby unavailable products would be validated on every login. #29517
+* Fix - Updated `$customer->get_shipping()` and `$customer->get_billing()` to return the full address after updating individual fields. #29538
+* Fix - Prevent cart to reset all nonce in front-end. #29542
+* Fix - Bump the version of the "Grouped product add to cart" template to 4.8.0 (was still at 4.0.0 by mistake). #29601
+* Fix - If we have a non-empty shipping address then do not overwrite the state or country fields with billing address data. #29605
+* Tweak - Add the support to `optgroups` in single select on Settings API. #29145
+* Tweak - Improves performance by avoiding an unnecessary redirect if custom permalink structure does not contain trailing slashes. #29422
+* Tweak - Update SSR db version tooltip to more accurately state the db version. #29438
+* Tweak - Adjust Twenty Twenty One order items header alignment. #29485
+* Tweak - Lost password form alignment issues. #29496
+* Tweak - Improve accessibility by adding `aria-hidden="true"` on strikethrough prices. #29603
+* Tweak - Default store location to US California. #29654
+* Tweak - Default store currency to USD. #29752
 
-**WooCommerce Admin - 2.1.0 & 2.1.1 & 2.1.2 & 2.1.3**
+** WooCommerce Blocks - 4.8.0 & 4.9.0 & 4.9.1 **
 
-* Add - Add navigation intro modal. #6367
-* Add - CES track settings tab on updating settings #6368
-* Add - Core settings redirection to new settings pages #6091
-* Add - Favorites tooltip to the navigation #6312
-* Add - Favoriting extensions client UI #6287
-* Add - Remove CES actions for adding and editing a product and editing an order #6355
-* Add - Settings client pages #6092
-* Add - Settings feature and pages #6089
-* Dev - Add filter to allow enabling the WP toolbar within the new navigation. #6371
-* Dev - Add navigation favorites data store #6275
-* Dev - Add unit tests to Navigation's Container component. #6344
-* Dev - Allow highlight tooltip to use body tag as parent. #6309
-* Dev - Change `siteUrl` to `homeUrl` on navigation site title #6240
-* Dev - Fix the react state update error on homescreen. #6320
-* Dev - Refactor head and body heights #6247
-* Dev - Remove Google fonts and material icons. #6343
-* Dev - Use box sizing and padding to fix nav and admin menu styling #6335
-* Enhancement - Move capability checks to client #6365
-* Enhancement - Move favorited menu items to primary menu #6290
-* Enhancement - Navigation: Add test to container component #6344
-* Enhancement - override wpbody styles when nav present #6354
-* Feature - Increase target audience for business feature step. #6508
+* Dev - Removed legacy handling for SSR blocks that rendered shortcodes. #4010
+* Fix - Customer address country saving to orders in certain circumstances. #4013
+* Fix - Prevent error messages returned by the API from displaying raw HTML. #4005
+* Fix - Proceed to checkout button click bug happening when the Coupon error is visible in the Cart block. #3996
+* Fix - Use font color in payment methods border. #4051
+* Fix - Load translation file for JS files that has translatable strings. #4050
+* Fix - Stop shipping package titles line-breaks occurring in the middle of a word. #4049
+* Fix - Fixed styling issues on the cart and checkout page in Twenty(X) themes. #4046
+* Fix - Fix headline alignment in the empty state of the cart block. #4044
+* Fix - Fix button alignment in Featured Product and Featured Category blocks. #4028
+* Fix - Check if Cart and Checkout are registered before removing payment methods. #4056
+* Enhancement - Registered payment methods now have access to the `shouldSavePayment` prop in their components (which indicates whether the shopper has checked the save payment method checkbox. #3990
+* Enhancement - Payment methods implementing the `savedTokenComponent` configuration property will now have the `onPaymentProcessing` event available to the registered component. #3982
+
+** WooCommerce Admin - 2.2.0 & 2.2.1 & 2.2.2 & 2.2.3 & 2.2.4 & 2.2.5 & 2.2.6 **
+* Add - Next new novel navigation nudge note #6610
+* Add - Add legacy report items to new navigation #6507
+* Add - Add preview site button on the appearance task #6457
+* Add - Back button to go to home screen from tasks in the task list. #6397
+* Add - Add a "rather not say" option to revenue in the profile wizard. #6475
+* Add - Remove Mollie promo note on install #6510
+* Add - Remote Inbox Notifications rule to trigger when WooCommerce Admin is upgraded. #6040
+* Add - CES survey for search product, order, customer #6420
+* Add - CES survey for importing products #6419
+* Add - CES survey for adding product categories, tags, and attributes #6418
+* Add - Additional analytics tracking for the business details step. #6575
+* Add - Include tracking for mail poet installs in the selective bundle install #6603
+* Add - Paystack payment provider to several african countries. #6579
+* Dev - Close activity panel tabs by default and track #6566
+* Dev - Update undefined task name properties for help panel tracks #6565
+* Dev - Refactor profile wizard benefits step and add tests #6583
+* Dev - Add filter to profile wizard steps #6564
+* Dev - Add nav intro modal tests #6518
+* Dev - Use wc filter to get status tabs for tools category #6525
+* Dev - Add nav header component tests #6509
+* Dev - Add initial tests for navigation Menu class #6492
+* Dev - Remove active item from navigation store #6486
+* Dev - Add navigation container tests #6464
+* Dev - Add nav favorite button tests #6446
+* Dev - Add a changelog lint check to PRs. #6414
+* Dev - Add navigation favorites tests #6409
+* Dev - support use of Array.flat in client and packages. #6411
+* Dev - Deprecate Onboarding::has_woocommerce_support. #6401
+* Dev - Add Dependency Extraction Webpack Plugin #5762
+* Dev - Add client-side filter for Navigation rootBackUrl #6505
+* Dev - Remove `items_purchased` and `account_type` props from onboarding profile API. #6520
+* Dev - Added warning when WC-Admin is active but not being used #6453
+* Dev - Store profiler - Added MailPoet to Business Details step  #6503
+* Dev - Store profiler - Added MailPoet to new Business Details step  #6515
+* Dev - Add tilde (~) to represent client root directory for imports. #6517
+* Dev - Add script automation for gathering hooks and filters. #6454
+* Dev - Add TypeScript and page objects to the E2E test suite. #6582
+* Dev - Introduce Typescript to Navigation utils #6477
+* Dev - Payments task: include Mercado Pago #6572
+* Dev - Ensure script asset.php files are included in builds #6635
+* Dev - Ensure production script asset names don't include .min suffix #6681
+* Dev - Do a git clean before the core release. #6945
+* Dev - Fix a bug where trying to load an asset registry causes a crash. #6951
 * Fix - Add check for navigating being enabled. #6462
-* Fix - Add customer name column to CSV export #6556
-* Fix - Add guard to "Deactivate Plugin" note handlers to prevent fatal error. #6532
+* Fix - Move the shipping input and text 1px lower. #6408
+* Fix - Correct the Klarna slug #6440
 * Fix - Broken link anchors to online documentation. #6455
-* Fix - Check if tax was successfully added before displaying notice #6229
+* Fix - Update payment card style on mobile #6413
+* Fix - Missing i18n in Welcome modal. #6456
+* Fix - Restore visual styles back to Analytics tabs. #5913
+* Fix - Update contrast and hover / active colors for analytics dropdown buttons #6504
+* Fix - Associated Order Number for refunds was hidden #6428
+* Fix - Fix issue where Loader::is_admin_page() would error if WooCommerce admin is disabled. #6563
 * Fix - Correct a bug where the JP connection flow would not happen when installing JP in the OBW. #6521
-* Fix - Crash of Analytics > Settings page when Gutenberg is installed. #6540
-* Fix - Display" option fails to collapse upon invoking "Help" option #6233
-* Fix - Email notes now are turned off by default #6324
-* Fix - Empty nav menu #6366
-* Fix - Enqueue scripts called incorrectly in php unit tests #6358
-* Fix - Hide tooltip in welcome modal #6142
-* Fix - Recommended Payment Banner missing in Safari #6375
-* Fix - Removal of core settings pages #6328
-* Fix - Removed @woocommerce/components/card from OBW #6374
-* Fix - Reset Navigation submenu before making Flyout #6396
-* Fix - Restore missing Correct the Klarna slug #6440
-* Fix - Top bar slightly overlaps wp-admin navigation on mobile #6292
-* Fix - update single column home screen width to 680px #6297
-* Fix - Update timing of InboxPanel state changes for the unread indicator #6246
-* Tweak - Enqueue beta features scripts on enqueue_scripts action instead of filter  #6358
-* Tweak - Move admin menu manipulation from admin_head to admin_menu #6310
-* Tweak - Navigation: Migrate methods to `admin_menu` hook #6319
-* Tweak - New Settings: Turn off in dev mode #6348
-* Tweak - Order and styles updates to nav footer #6373
-* Tweak - Remove categories without menu items #6329
-* Tweak - Set `is_deleted` from the database when instantiating a `Note` #6322
-* Tweak - Update inline documentation for navigation Screen class #6173
-* Tweak - Updates to copy and punctuation to be more conversational and consistent. #6298
-
-**WooCommerce Blocks - 4.5.0 & 4.6.0 & 4.7.0**
-
-* Enhancement - Login links on the checkout should use the account page. ([3844](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3844))
-* Enhancement - Prevent checkout linking to trashed terms and policy pages. ([3843](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3843))
-* Enhancement - Improved nonce logic by moving nonces to cart routes only. ([3812](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3812))
-* Enhancement - If coupons become invalid between applying to a cart and checking out, show the user a notice when the order is placed. ([3810](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3810))
-* Enhancement - Improve design of cart and checkout sidebars. ([3797](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3797))
-* Enhancement - Improve error displayed to customers when an item's stock status changes during checkout. ([3703](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3703))
-* Enhancement - Dev - Block Checkout will now respect custom address locales and custom country states via core filter hooks. ([3662](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3662))
-* Enhancement - Update checkout block payment methods UI. ([3439](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3439))
-* Enhancement - StoreAPI: Inject Order and Cart Controllers into Routes. ([3871](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3871))
-* Enhancement - Update Panel component class names to follow guidelines. More info can be found in our theming docs: https://github.com/woocommerce/woocommerce-gutenberg-products-block/blob/18dd54f07262b4d1dcf15561624617f824fcdc22/docs/theming/class-names-update-460.md. ([3860](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3860))
-* Enhancement - Refactor block type registration to support 3rd party integrations.
-* Enhancement - A new configuration property is available to registered payment methods for additional logic handling of saved payment method tokens. ([3961](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3961))
-* Enhancement - Provided billing data to payment method extensions so they can decide if payment is possible. ([3922](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3922))
-* Enhancement - Prevent errant payment methods from keeping Cart and Checkout blocks from loading. ([3920](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3920))
-* Fix block elements that don't play well with dark backgrounds. ([3887](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3887))
-* Fix - JS warning if two cart products share the same name. ([3814](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3814))
-* Fix - Align place order button to the right of the block. ([3803](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3803))
-* Fix - Ensure special characters are displayed properly in the Cart sidebar. ([3721](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3721))
-* Fix - Bug where the total price of items did not include tax in the cart and checkout blocks. ([3851](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3851))
-* Fix - Handle out-of-stock product visibility setting in All Products block. ([3859](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3859))
-* Fix - Show cart item subtotal instead of total in Cart and Checkout blocks ([#3905](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3905))
-* Fix - Fix button styles in Twenty Nineteen theme. ([3862](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3862))
-* Fix - Return correct sale/regular prices for variable products in the Store API. ([3854](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3854))
-* Fix - Remove shadows from text buttons and gradient background from selects in some themes. ([3846](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3846))
-* Fix - Hide Browse Shop link in cart block empty state when there is no shop page. ([3845](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3845))
-* Fix - Remove extra padding from payment methods with no description. ([3952](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3952))
-* Fix - "save payment" checkbox not showing for payment methods. ([3950](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3950))
-* Fix - Cart preview when shipping rates are set to be hidden until an address is entered. ([3946](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3946))
-* Fix - Sync cart item quantity if its Implicitly changed. ([3907](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3907))
-* Fix - FSE not being visible when WC Blocks was enabled. ([3898](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3898))
-* Fix - Ensure sale badges have a uniform height in the Cart block. ([3897](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3897))
-* Note - Internally, this release has modified how `AbstractBlock` (the base class for all of our blocks) functions, and how it loads assets. `AbstractBlock` is internal to this project and does not seem like something that would ever need to be extended by 3rd parties, but note if you are doing so for whatever reason, your implementation would need to be updated to match. ([3829](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3829))
+* Fix - Show management links when the task list is complete (even if its not hidden). #6657
+* Fix - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
+* Fix - Update the Mercado option used for enabling/disabling. #6677
+* Fix - Improve AddFirstProduct email note contents. #6617
+* Fix - Check if features are currently being enabled #6688
+* Fix - Fix the activity panel toggle not closing on click #6679
+* Fix - Fix use of feature checks and remove deprecated method calls #6687
+* Fix - Allow the manager role to query certain options #6577
+* Fix - Delete customer data on network user deletion #6574
+* Fix - Fix Themes step visibility in IE 11 #6578
+* Fix - Fix hidden menu title on smaller screens #6562
+* Fix - Add gross sales column to CSV export #6567
+* Fix - Disable the continue btn on OBW when requested are being made #6838
+* Fix - Calling of get_script_asset_filename with extra parameter #6955
+* Fix - Address an issue with OBW when installing only WooCommerce payments and Jetpack. #6957
+* Tweak - Add default value for contains op #6622
+* Tweak - Adjust targeting store age for the Add First Product note #6554
+* Tweak - Improve WC Shipping & Tax logic #6547
+* Tweak - Update Insight inbox note content #6555
+* Tweak - Remove mobile activity panel toggle #6539
+* Tweak - Refactor autoloader to remove global variable. #6412
+* Tweak - Revert WCPay international support for bundled package #6901
+* Tweak - Store profiler - Changed MailPoet's title and description #6886
+* Tweak - Update PayU logo #6829
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/changelog.txt).
diff --git a/src/Container.php b/src/Container.php
index 517239afeb7..dbfb4656f4d 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -7,12 +7,15 @@ namespace Automattic\WooCommerce;
 
 use Automattic\WooCommerce\Internal\DependencyManagement\ExtendedContainer;
 use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\DownloadPermissionsAdjusterServiceProvider;
+use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\AssignDefaultCategoryServiceProvider;
+use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ProductAttributesLookupServiceProvider;
 use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ProxiesServiceProvider;
+use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ThemeManagementServiceProvider;
 
 /**
  * PSR11 compliant dependency injection container for WooCommerce.
  *
- * Classes in the `src` directory should specify dependencies from that directory via constructor arguments
+ * Classes in the `src` directory should specify dependencies from that directory via an 'init' method having arguments
  * with type hints. If an instance of the container itself is needed, the type hint to use is \Psr\Container\ContainerInterface.
  *
  * Classes in the `src` directory should interact with anything outside (especially code in the `includes` directory
@@ -33,8 +36,11 @@ final class Container implements \Psr\Container\ContainerInterface {
 	 * @var string[]
 	 */
 	private $service_providers = array(
-		ProxiesServiceProvider::class,
+		AssignDefaultCategoryServiceProvider::class,
 		DownloadPermissionsAdjusterServiceProvider::class,
+		ProductAttributesLookupServiceProvider::class,
+		ProxiesServiceProvider::class,
+		ThemeManagementServiceProvider::class,
 	);
 
 	/**
diff --git a/src/Internal/AssignDefaultCategory.php b/src/Internal/AssignDefaultCategory.php
new file mode 100644
index 00000000000..34968e974ee
--- /dev/null
+++ b/src/Internal/AssignDefaultCategory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * AssignDefaultCategory class file.
+ */
+
+namespace Automattic\WooCommerce\Internal;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class to assign default category to products.
+ */
+class AssignDefaultCategory {
+	/**
+	 * Class initialization, to be executed when the class is resolved by the container.
+	 *
+	 * @internal
+	 */
+	final public function init() {
+		add_action( 'wc_schedule_update_product_default_cat', array( $this, 'maybe_assign_default_product_cat' ) );
+	}
+
+	/**
+	 * When a product category is deleted, we need to check
+	 * if the product has no categories assigned. Then assign
+	 * it a default category. We delay this with a scheduled
+	 * action job to not block the response.
+	 *
+	 * @return void
+	 */
+	public function schedule_action() {
+		WC()->queue()->schedule_single(
+			time(),
+			'wc_schedule_update_product_default_cat',
+			array(),
+			'wc_update_product_default_cat'
+		);
+	}
+
+	/**
+	 * Assigns default product category for products
+	 * that have no categories.
+	 *
+	 * @return void
+	 */
+	public function maybe_assign_default_product_cat() {
+		global $wpdb;
+
+		$default_category = get_option( 'default_product_cat', 0 );
+
+		if ( $default_category ) {
+			$wpdb->query(
+				$wpdb->prepare(
+					"INSERT INTO {$wpdb->term_relationships} (object_id, term_taxonomy_id)
+					SELECT DISTINCT posts.ID, %s FROM {$wpdb->posts} posts
+					LEFT JOIN
+						(
+							SELECT object_id FROM {$wpdb->term_relationships} term_relationships
+							LEFT JOIN {$wpdb->term_taxonomy} term_taxonomy ON term_relationships.term_taxonomy_id = term_taxonomy.term_taxonomy_id
+							WHERE term_taxonomy.taxonomy = 'product_cat'
+						) AS tax_query
+					ON posts.ID = tax_query.object_id
+					WHERE posts.post_type = 'product'
+					AND tax_query.object_id IS NULL",
+					$default_category
+				)
+			);
+			wp_cache_flush();
+			delete_transient( 'wc_term_counts' );
+			wp_update_term_count_now( array( $default_category ), 'product_cat' );
+		}
+	}
+}
diff --git a/src/Internal/DependencyManagement/ExtendedContainer.php b/src/Internal/DependencyManagement/ExtendedContainer.php
index a4e084cf76a..0615ec51713 100644
--- a/src/Internal/DependencyManagement/ExtendedContainer.php
+++ b/src/Internal/DependencyManagement/ExtendedContainer.php
@@ -81,7 +81,7 @@ class ExtendedContainer extends BaseContainer {
 		}
 
 		$concrete_class = $this->get_class_from_concrete( $concrete );
-		if ( isset( $concrete_class ) && ! $this->is_class_allowed( $concrete_class ) ) {
+		if ( isset( $concrete_class ) && ! $this->is_class_allowed( $concrete_class ) && ! $this->is_anonymous_class( $concrete_class ) ) {
 			throw new ContainerException( "You cannot use concrete '$concrete_class', only classes in the {$this->woocommerce_namespace} namespace are allowed." );
 		}
 
@@ -149,4 +149,14 @@ class ExtendedContainer extends BaseContainer {
 	protected function is_class_allowed( string $class_name ): bool {
 		return StringUtil::starts_with( $class_name, $this->woocommerce_namespace, false ) || in_array( $class_name, $this->registration_whitelist, true );
 	}
+
+	/**
+	 * Check if a class name corresponds to an anonymous class.
+	 *
+	 * @param string $class_name The class name to check.
+	 * @return bool True if the name corresponds to an anonymous class.
+	 */
+	protected function is_anonymous_class( string $class_name ): bool {
+		return StringUtil::starts_with( $class_name, 'class@anonymous' );
+	}
 }
diff --git a/src/Internal/DependencyManagement/ServiceProviders/AssignDefaultCategoryServiceProvider.php b/src/Internal/DependencyManagement/ServiceProviders/AssignDefaultCategoryServiceProvider.php
new file mode 100644
index 00000000000..cba9e812aab
--- /dev/null
+++ b/src/Internal/DependencyManagement/ServiceProviders/AssignDefaultCategoryServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * AssignDefaultCategoryServiceProvider class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
+
+use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+
+/**
+ * Service provider for the AssignDefaultCategory class.
+ */
+class AssignDefaultCategoryServiceProvider extends AbstractServiceProvider {
+
+	/**
+	 * The classes/interfaces that are serviced by this service provider.
+	 *
+	 * @var array
+	 */
+	protected $provides = array(
+		AssignDefaultCategory::class,
+	);
+
+	/**
+	 * Register the classes.
+	 */
+	public function register() {
+		$this->share( AssignDefaultCategory::class );
+	}
+}
diff --git a/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php b/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php
new file mode 100644
index 00000000000..f1a818c25f0
--- /dev/null
+++ b/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ProductAttributesLookupServiceProvider class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
+
+use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\LookupDataStore;
+
+/**
+ * Service provider for the ProductAttributesLookupServiceProvider namespace.
+ */
+class ProductAttributesLookupServiceProvider extends AbstractServiceProvider {
+
+	/**
+	 * The classes/interfaces that are serviced by this service provider.
+	 *
+	 * @var array
+	 */
+	protected $provides = array(
+		DataRegenerator::class,
+	);
+
+	/**
+	 * Register the classes.
+	 */
+	public function register() {
+		$this->share( DataRegenerator::class )->addArgument( LookupDataStore::class );
+		$this->share( LookupDataStore::class );
+	}
+}
diff --git a/src/Internal/DependencyManagement/ServiceProviders/ThemeManagementServiceProvider.php b/src/Internal/DependencyManagement/ServiceProviders/ThemeManagementServiceProvider.php
new file mode 100644
index 00000000000..7216b04271b
--- /dev/null
+++ b/src/Internal/DependencyManagement/ServiceProviders/ThemeManagementServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * ThemeManagementServiceProvider class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
+
+use Automattic\WooCommerce\Internal\ThemeSupport;
+use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
+
+/**
+ * Service provider for the classes in the Automattic\WooCommerce\ThemeManagement namespace.
+ */
+class ThemeManagementServiceProvider extends AbstractServiceProvider {
+
+	/**
+	 * The classes/interfaces that are serviced by this service provider.
+	 *
+	 * @var array
+	 */
+	protected $provides = array(
+		ThemeSupport::class,
+	);
+
+	/**
+	 * Register the classes.
+	 */
+	public function register() {
+		$this->share_with_auto_arguments( ThemeSupport::class );
+	}
+}
diff --git a/src/Internal/ProductAttributesLookup/DataRegenerator.php b/src/Internal/ProductAttributesLookup/DataRegenerator.php
new file mode 100644
index 00000000000..e7a60bffd35
--- /dev/null
+++ b/src/Internal/ProductAttributesLookup/DataRegenerator.php
@@ -0,0 +1,396 @@
+<?php
+/**
+ * DataRegenerator class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\ProductAttributesLookup;
+
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\LookupDataStore;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * This class handles the (re)generation of the product attributes lookup table.
+ * It schedules the regeneration in small product batches by itself, so it can be used outside the
+ * regular WooCommerce data regenerations mechanism.
+ *
+ * After the regeneration is completed a wp_wc_product_attributes_lookup table will exist with entries for
+ * all the products that existed when initiate_regeneration was invoked; entries for products created after that
+ * are supposed to be created/updated by the appropriate data store classes (or by the code that uses
+ * the data store classes) whenever a product is created/updated.
+ *
+ * Additionally, after the regeneration is completed a 'woocommerce_attribute_lookup__enabled' option
+ * with a value of 'no' will have been created.
+ *
+ * This class also adds two entries to the Status - Tools menu: one for manually regenerating the table contents,
+ * and another one for enabling or disabling the actual lookup table usage.
+ */
+class DataRegenerator {
+
+	const PRODUCTS_PER_GENERATION_STEP = 10;
+
+	/**
+	 * The data store to use.
+	 *
+	 * @var LookupDataStore
+	 */
+	private $data_store;
+
+	/**
+	 * The lookup table name.
+	 *
+	 * @var string
+	 */
+	private $lookup_table_name;
+
+	/**
+	 * DataRegenerator constructor.
+	 */
+	public function __construct() {
+		global $wpdb;
+
+		$this->lookup_table_name = $wpdb->prefix . 'wc_product_attributes_lookup';
+
+		add_filter(
+			'woocommerce_debug_tools',
+			function( $tools ) {
+				return $this->add_initiate_regeneration_entry_to_tools_array( $tools );
+			},
+			1,
+			999
+		);
+
+		add_action(
+			'woocommerce_run_product_attribute_lookup_update_callback',
+			function () {
+				$this->run_regeneration_step_callback();
+			}
+		);
+	}
+
+	/**
+	 * Class initialization, invoked by the DI container.
+	 *
+	 * @internal
+	 * @param LookupDataStore $data_store The data store to use.
+	 */
+	final public function init( LookupDataStore $data_store ) {
+		$this->data_store = $data_store;
+	}
+
+	/**
+	 * Initialize the regeneration procedure:
+	 * deletes the lookup table and related options if they exist,
+	 * then it creates the table and runs the first step of the regeneration process.
+	 *
+	 * This is the method that should be used as a callback for a data regeneration in wc-update-functions, e.g.:
+	 *
+	 * function wc_update_XX_regenerate_product_attributes_lookup_table() {
+	 *   wc_get_container()->get(DataRegenerator::class)->initiate_regeneration();
+	 *   return false;
+	 * }
+	 *
+	 * (Note how we are returning "false" since the class handles the step scheduling by itself).
+	 */
+	public function initiate_regeneration() {
+		$this->delete_all_attributes_lookup_data();
+		$products_exist = $this->initialize_table_and_data();
+		if ( $products_exist ) {
+			$this->enqueue_regeneration_step_run();
+		} else {
+			$this->finalize_regeneration();
+		}
+	}
+
+	/**
+	 * Tells if a regeneration is already in progress.
+	 *
+	 * @return bool True if a regeneration is already in progress.
+	 */
+	public function regeneration_is_in_progress() {
+		return ! is_null( get_option( 'woocommerce_attribute_lookup__last_products_page_processed', null ) );
+	}
+
+	/**
+	 * Delete all the existing data related to the lookup table, including the table itself.
+	 *
+	 * Shortcut to run this method in case the debug tools UI isn't available or for quick debugging:
+	 *
+	 * wp eval "wc_get_container()->get(Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator::class)->delete_all_attributes_lookup_data();"
+	 */
+	public function delete_all_attributes_lookup_data() {
+		global $wpdb;
+
+		delete_option( 'woocommerce_attribute_lookup__enabled' );
+		delete_option( 'woocommerce_attribute_lookup__last_product_id_to_process' );
+		delete_option( 'woocommerce_attribute_lookup__last_products_page_processed' );
+
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->lookup_table_name );
+	}
+
+	/**
+	 * Create the lookup table and initialize the options that will be temporarily used
+	 * while the regeneration is in progress.
+	 *
+	 * @return bool True if there's any product at all in the database, false otherwise.
+	 */
+	private function initialize_table_and_data() {
+		global $wpdb;
+
+		// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
+		$wpdb->query(
+			'
+CREATE TABLE ' . $this->lookup_table_name . '(
+  product_id bigint(20) NOT NULL,
+  product_or_parent_id bigint(20) NOT NULL,
+  taxonomy varchar(32) NOT NULL,
+  term_id bigint(20) NOT NULL,
+  is_variation_attribute tinyint(1) NOT NULL,
+  in_stock tinyint(1) NOT NULL
+ );
+		'
+		);
+		// phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
+
+		$last_existing_product_id =
+			WC()->call_function(
+				'wc_get_products',
+				array(
+					'return'  => 'ids',
+					'limit'   => 1,
+					'orderby' => array(
+						'ID' => 'DESC',
+					),
+				)
+			);
+
+		if ( ! $last_existing_product_id ) {
+			// No products exist, nothing to (re)generate.
+			return false;
+		}
+
+		update_option( 'woocommerce_attribute_lookup__last_product_id_to_process', current( $last_existing_product_id ) );
+		update_option( 'woocommerce_attribute_lookup__last_products_page_processed', 0 );
+
+		return true;
+	}
+
+	/**
+	 * Action scheduler callback, performs one regeneration step and then
+	 * schedules the next step if necessary.
+	 */
+	private function run_regeneration_step_callback() {
+		if ( ! $this->regeneration_is_in_progress() ) {
+			return;
+		}
+
+		$result = $this->do_regeneration_step();
+		if ( $result ) {
+			$this->enqueue_regeneration_step_run();
+		} else {
+			$this->finalize_regeneration();
+		}
+	}
+
+	/**
+	 * Enqueue one regeneration step in action scheduler.
+	 */
+	private function enqueue_regeneration_step_run() {
+		$queue = WC()->get_instance_of( \WC_Queue::class );
+		$queue->schedule_single(
+			WC()->call_function( 'time' ) + 1,
+			'woocommerce_run_product_attribute_lookup_update_callback',
+			array(),
+			'woocommerce-db-updates'
+		);
+	}
+
+	/**
+	 * Perform one regeneration step: grabs a chunk of products and creates
+	 * the appropriate entries for them in the lookup table.
+	 *
+	 * @return bool True if more steps need to be run, false otherwise.
+	 */
+	private function do_regeneration_step() {
+		$last_products_page_processed = get_option( 'woocommerce_attribute_lookup__last_products_page_processed' );
+		$current_products_page        = (int) $last_products_page_processed + 1;
+
+		$product_ids = WC()->call_function(
+			'wc_get_products',
+			array(
+				'limit'   => self::PRODUCTS_PER_GENERATION_STEP,
+				'page'    => $current_products_page,
+				'orderby' => array(
+					'ID' => 'ASC',
+				),
+				'return'  => 'ids',
+			)
+		);
+
+		if ( ! $product_ids ) {
+			return false;
+		}
+
+		foreach ( $product_ids as $id ) {
+			$this->data_store->update_data_for_product( $id );
+		}
+
+		update_option( 'woocommerce_attribute_lookup__last_products_page_processed', $current_products_page );
+
+		$last_product_id_to_process = get_option( 'woocommerce_attribute_lookup__last_product_id_to_process' );
+		return end( $product_ids ) < $last_product_id_to_process;
+	}
+
+	/**
+	 * Cleanup/final option setup after the regeneration has been completed.
+	 */
+	private function finalize_regeneration() {
+		delete_option( 'woocommerce_attribute_lookup__last_product_id_to_process' );
+		delete_option( 'woocommerce_attribute_lookup__last_products_page_processed' );
+		update_option( 'woocommerce_attribute_lookup__enabled', 'no' );
+	}
+
+	/**
+	 * Check if the lookup table exists in the database.
+	 *
+	 * @return bool True if the lookup table exists in the database.
+	 */
+	private function lookup_table_exists() {
+		global $wpdb;
+		$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $this->lookup_table_name ) );
+
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		return $this->lookup_table_name === $wpdb->get_var( $query );
+	}
+
+	/**
+	 * Add a 'Regenerate product attributes lookup table' entry to the Status - Tools page.
+	 *
+	 * @param array $tools_array The tool definitions array that is passed ro the woocommerce_debug_tools filter.
+	 * @return array The tools array with the entry added.
+	 */
+	private function add_initiate_regeneration_entry_to_tools_array( array $tools_array ) {
+		if ( ! $this->data_store->is_feature_visible() ) {
+			return $tools_array;
+		}
+
+		$lookup_table_exists       = $this->lookup_table_exists();
+		$generation_is_in_progress = $this->regeneration_is_in_progress();
+
+		// Regenerate table.
+
+		if ( $lookup_table_exists ) {
+			$generate_item_name   = __( 'Regenerate the product attributes lookup table', 'woocommerce' );
+			$generate_item_desc   = __( 'This tool will regenerate the product attributes lookup table data from existing products data. This process may take a while.', 'woocommerce' );
+			$generate_item_return = __( 'Product attributes lookup table data is regenerating', 'woocommerce' );
+			$generate_item_button = __( 'Regenerate', 'woocommerce' );
+		} else {
+			$generate_item_name   = __( 'Create and fill product attributes lookup table', 'woocommerce' );
+			$generate_item_desc   = __( 'This tool will create the product attributes lookup table data and fill it with existing products data. This process may take a while.', 'woocommerce' );
+			$generate_item_return = __( 'Product attributes lookup table is being filled', 'woocommerce' );
+			$generate_item_button = __( 'Create', 'woocommerce' );
+		}
+
+		$entry = array(
+			'name'             => $generate_item_name,
+			'desc'             => $generate_item_desc,
+			'requires_refresh' => true,
+			'callback'         => function() use ( $generate_item_return ) {
+				$this->initiate_regeneration_from_tools_page();
+				return $generate_item_return;
+			},
+		);
+
+		if ( $generation_is_in_progress ) {
+			$entry['button'] = sprintf(
+				/* translators: %d: How many products have been processed so far. */
+				__( 'Filling in progress (%d)', 'woocommerce' ),
+				get_option( 'woocommerce_attribute_lookup__last_products_page_processed', 0 ) * self::PRODUCTS_PER_GENERATION_STEP
+			);
+			$entry['disabled'] = true;
+		} else {
+			$entry['button'] = $generate_item_button;
+		}
+
+		$tools_array['regenerate_product_attributes_lookup_table'] = $entry;
+
+		if ( $lookup_table_exists ) {
+
+			// Delete the table.
+
+			$tools_array['delete_product_attributes_lookup_table'] = array(
+				'name'             => __( 'Delete the product attributes lookup table', 'woocommerce' ),
+				'desc'             => sprintf(
+					'<strong class="red">%1$s</strong> %2$s',
+					__( 'Note:', 'woocommerce' ),
+					__( 'This will delete the product attributes lookup table. You can create it again with the "Create and fill product attributes lookup table" tool.', 'woocommerce' )
+				),
+				'button'           => __( 'Delete', 'woocommerce' ),
+				'requires_refresh' => true,
+				'callback'         => function () {
+					$this->delete_all_attributes_lookup_data();
+					return __( 'Product attributes lookup table has been deleted.', 'woocommerce' );
+				},
+			);
+		}
+
+		if ( $lookup_table_exists && ! $generation_is_in_progress ) {
+
+			// Enable or disable table usage.
+
+			if ( 'yes' === get_option( 'woocommerce_attribute_lookup__enabled' ) ) {
+				$tools_array['disable_product_attributes_lookup_table_usage'] = array(
+					'name'             => __( 'Disable the product attributes lookup table usage', 'woocommerce' ),
+					'desc'             => __( 'The product attributes lookup table usage is currently enabled, use this tool to disable it.', 'woocommerce' ),
+					'button'           => __( 'Disable', 'woocommerce' ),
+					'requires_refresh' => true,
+					'callback'         => function () {
+						$this->enable_or_disable_lookup_table_usage( false );
+						return __( 'Product attributes lookup table usage has been disabled.', 'woocommerce' );
+					},
+				);
+			} else {
+				$tools_array['enable_product_attributes_lookup_table_usage'] = array(
+					'name'             => __( 'Enable the product attributes lookup table usage', 'woocommerce' ),
+					'desc'             => __( 'The product attributes lookup table usage is currently disabled, use this tool to enable it.', 'woocommerce' ),
+					'button'           => __( 'Enable', 'woocommerce' ),
+					'requires_refresh' => true,
+					'callback'         => function () {
+						$this->enable_or_disable_lookup_table_usage( true );
+						return __( 'Product attributes lookup table usage has been enabled.', 'woocommerce' );
+					},
+				);
+			}
+		}
+
+		return $tools_array;
+	}
+
+	/**
+	 * Callback to initiate the regeneration process from the Status - Tools page.
+	 *
+	 * @throws \Exception The regeneration is already in progress.
+	 */
+	private function initiate_regeneration_from_tools_page() {
+		if ( $this->regeneration_is_in_progress() ) {
+			throw new \Exception( 'Product attributes lookup table is already regenerating.' );
+		}
+
+		$this->initiate_regeneration();
+	}
+
+	/**
+	 * Enable or disable the actual lookup table usage.
+	 *
+	 * @param bool $enable True to enable, false to disable.
+	 * @throws \Exception A lookup table regeneration is currently in progress.
+	 */
+	private function enable_or_disable_lookup_table_usage( $enable ) {
+		if ( $this->regeneration_is_in_progress() ) {
+			throw new \Exception( "Can't enable or disable the attributes lookup table usage while it's regenerating." );
+		}
+
+		update_option( 'woocommerce_attribute_lookup__enabled', $enable ? 'yes' : 'no' );
+	}
+}
diff --git a/src/Internal/ProductAttributesLookup/LookupDataStore.php b/src/Internal/ProductAttributesLookup/LookupDataStore.php
new file mode 100644
index 00000000000..77cc2845238
--- /dev/null
+++ b/src/Internal/ProductAttributesLookup/LookupDataStore.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * LookupDataStore class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\ProductAttributesLookup;
+
+use Automattic\WooCommerce\Utilities\ArrayUtil;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Data store class for the product attributes lookup table.
+ */
+class LookupDataStore {
+
+	/**
+	 * The lookup table name.
+	 *
+	 * @var string
+	 */
+	private $lookup_table_name;
+
+	/**
+	 * Is the feature visible?
+	 *
+	 * @var bool
+	 */
+	private $is_feature_visible;
+
+	/**
+	 * LookupDataStore constructor. Makes the feature hidden by default.
+	 */
+	public function __construct() {
+		global $wpdb;
+
+		$this->lookup_table_name  = $wpdb->prefix . 'wc_product_attributes_lookup';
+		$this->is_feature_visible = false;
+	}
+
+	/**
+	 * Checks if the feature is visible (so that dedicated entries will be added to the debug tools page).
+	 *
+	 * @return bool True if the feature is visible.
+	 */
+	public function is_feature_visible() {
+		return $this->is_feature_visible;
+	}
+
+	/**
+	 * Makes the feature visible, so that dedicated entries will be added to the debug tools page.
+	 */
+	public function show_feature() {
+		$this->is_feature_visible = true;
+	}
+
+	/**
+	 * Hides the feature, so that no entries will be added to the debug tools page.
+	 */
+	public function hide_feature() {
+		$this->is_feature_visible = false;
+	}
+
+	/**
+	 * Insert or update the lookup data for a given product or variation.
+	 * If a variable product is passed the information is updated for all of its variations.
+	 *
+	 * @param int|WC_Product $product Product object or id.
+	 * @throws \Exception A variation object is passed.
+	 */
+	public function update_data_for_product( $product ) {
+		// TODO: For now data is always deleted and fully regenerated, existing data should be updated instead.
+
+		if ( ! is_a( $product, \WC_Product::class ) ) {
+			$product = WC()->call_function( 'wc_get_product', $product );
+		}
+
+		if ( $this->is_variation( $product ) ) {
+			throw new \Exception( "LookupDataStore::update_data_for_product can't be called for variations." );
+		}
+
+		$this->delete_lookup_table_entries_for( $product->get_id() );
+
+		if ( $this->is_variable_product( $product ) ) {
+			$this->create_lookup_table_entries_for_variable_product( $product );
+		} else {
+			$this->create_lookup_table_entries_for_simple_product( $product );
+		}
+	}
+
+	/**
+	 * Delete all the lookup table entries for a given product
+	 * (entries are identified by the "parent_or_product_id" field)
+	 *
+	 * @param int $product_id Simple product id, or main/parent product id for variable products.
+	 */
+	private function delete_lookup_table_entries_for( int $product_id ) {
+		global $wpdb;
+
+		// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
+		$wpdb->query(
+			$wpdb->prepare(
+				'DELETE FROM ' . $this->lookup_table_name . ' WHERE product_or_parent_id = %d',
+				$product_id
+			)
+		);
+		// phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
+	}
+
+	/**
+	 * Create lookup table entries for a simple (non variable) product.
+	 * Assumes that no entries exist yet.
+	 *
+	 * @param \WC_Product $product The product to create the entries for.
+	 */
+	private function create_lookup_table_entries_for_simple_product( \WC_Product $product ) {
+		$product_attributes_data = $this->get_attribute_taxonomies( $product );
+		$has_stock               = $product->is_in_stock();
+		$product_id              = $product->get_id();
+		foreach ( $product_attributes_data as $taxonomy => $data ) {
+			$term_ids = $data['term_ids'];
+			foreach ( $term_ids as $term_id ) {
+				$this->insert_lookup_table_data( $product_id, $product_id, $taxonomy, $term_id, false, $has_stock );
+			}
+		}
+	}
+
+	/**
+	 * Create lookup table entries for a variable product.
+	 * Assumes that no entries exist yet.
+	 *
+	 * @param \WC_Product_Variable $product The product to create the entries for.
+	 */
+	private function create_lookup_table_entries_for_variable_product( \WC_Product_Variable $product ) {
+		$product_attributes_data       = $this->get_attribute_taxonomies( $product );
+		$variation_attributes_data     = array_filter(
+			$product_attributes_data,
+			function( $item ) {
+				return $item['used_for_variations'];
+			}
+		);
+		$non_variation_attributes_data = array_filter(
+			$product_attributes_data,
+			function( $item ) {
+				return ! $item['used_for_variations'];
+			}
+		);
+
+		$main_product_has_stock = $product->is_in_stock();
+		$main_product_id        = $product->get_id();
+
+		foreach ( $non_variation_attributes_data as $taxonomy => $data ) {
+			$term_ids = $data['term_ids'];
+			foreach ( $term_ids as $term_id ) {
+				$this->insert_lookup_table_data( $main_product_id, $main_product_id, $taxonomy, $term_id, false, $main_product_has_stock );
+			}
+		}
+
+		$term_ids_by_slug_cache = $this->get_term_ids_by_slug_cache( array_keys( $variation_attributes_data ) );
+		$variations             = $this->get_variations_of( $product );
+
+		foreach ( $variation_attributes_data as $taxonomy => $data ) {
+			foreach ( $variations as $variation ) {
+				$variation_id                 = $variation->get_id();
+				$variation_has_stock          = $variation->is_in_stock();
+				$variation_definition_term_id = $this->get_variation_definition_term_id( $variation, $taxonomy, $term_ids_by_slug_cache );
+				if ( $variation_definition_term_id ) {
+					$this->insert_lookup_table_data( $variation_id, $main_product_id, $taxonomy, $variation_definition_term_id, true, $variation_has_stock );
+				} else {
+					$term_ids_for_taxonomy = $data['term_ids'];
+					foreach ( $term_ids_for_taxonomy as $term_id ) {
+						$this->insert_lookup_table_data( $variation_id, $main_product_id, $taxonomy, $term_id, true, $variation_has_stock );
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get a cache of term ids by slug for a set of taxonomies, with this format:
+	 *
+	 * [
+	 *   'taxonomy' => [
+	 *     'slug_1' => id_1,
+	 *     'slug_2' => id_2,
+	 *     ...
+	 *   ], ...
+	 * ]
+	 *
+	 * @param array $taxonomies List of taxonomies to build the cache for.
+	 * @return array A dictionary of taxonomies => dictionary of term slug => term id.
+	 */
+	private function get_term_ids_by_slug_cache( $taxonomies ) {
+		$result = array();
+		foreach ( $taxonomies as $taxonomy ) {
+			$terms               = WC()->call_function(
+				'get_terms',
+				array(
+					'taxonomy'   => $taxonomy,
+					'hide_empty' => false,
+					'fields'     => 'id=>slug',
+				)
+			);
+			$result[ $taxonomy ] = array_flip( $terms );
+		}
+		return $result;
+	}
+
+	/**
+	 * Get the id of the term that defines a variation for a given taxonomy,
+	 * or null if there's no such defining id (for variations having "Any <taxonomy>" as the definition)
+	 *
+	 * @param \WC_Product_Variation $variation The variation to get the defining term id for.
+	 * @param string                $taxonomy The taxonomy to get the defining term id for.
+	 * @param array                 $term_ids_by_slug_cache A term ids by slug as generated by get_term_ids_by_slug_cache.
+	 * @return int|null The term id, or null if there's no defining id for that taxonomy in that variation.
+	 */
+	private function get_variation_definition_term_id( \WC_Product_Variation $variation, string $taxonomy, array $term_ids_by_slug_cache ) {
+		$variation_attributes = $variation->get_attributes();
+		$term_slug            = ArrayUtil::get_value_or_default( $variation_attributes, $taxonomy );
+		if ( $term_slug ) {
+			return $term_ids_by_slug_cache[ $taxonomy ][ $term_slug ];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the variations of a given variable product.
+	 *
+	 * @param \WC_Product_Variable $product The product to get the variations for.
+	 * @return array An array of WC_Product_Variation objects.
+	 */
+	private function get_variations_of( \WC_Product_Variable $product ) {
+		$variation_ids = $product->get_children();
+		return array_map(
+			function( $id ) {
+				return WC()->call_function( 'wc_get_product', $id );
+			},
+			$variation_ids
+		);
+	}
+
+	/**
+	 * Check if a given product is a variable product.
+	 *
+	 * @param \WC_Product $product The product to check.
+	 * @return bool True if it's a variable product, false otherwise.
+	 */
+	private function is_variable_product( \WC_Product $product ) {
+		return is_a( $product, \WC_Product_Variable::class );
+	}
+
+	/**
+	 * Check if a given product is a variation.
+	 *
+	 * @param \WC_Product $product The product to check.
+	 * @return bool True if it's a variation, false otherwise.
+	 */
+	private function is_variation( \WC_Product $product ) {
+		return is_a( $product, \WC_Product_Variation::class );
+	}
+
+	/**
+	 * Return the list of taxonomies used for variations on a product together with
+	 * the associated term ids, with the following format:
+	 *
+	 * [
+	 *   'taxonomy_name' =>
+	 *   [
+	 *     'term_ids' => [id, id, ...],
+	 *     'used_for_variations' => true|false
+	 *   ], ...
+	 * ]
+	 *
+	 * @param \WC_Product $product The product to get the attribute taxonomies for.
+	 * @return array Information about the attribute taxonomies of the product.
+	 */
+	private function get_attribute_taxonomies( \WC_Product $product ) {
+		$product_attributes = $product->get_attributes();
+		$result             = array();
+		foreach ( $product_attributes as $taxonomy_name => $attribute_data ) {
+			if ( ! $attribute_data->get_id() ) {
+				// Custom product attribute, not suitable for attribute-based filtering.
+				continue;
+			}
+
+			$result[ $taxonomy_name ] = array(
+				'term_ids'            => $attribute_data->get_options(),
+				'used_for_variations' => $attribute_data->get_variation(),
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Insert one entry in the lookup table.
+	 *
+	 * @param int    $product_id The product id.
+	 * @param int    $product_or_parent_id The product id for non-variable products, the main/parent product id for variations.
+	 * @param string $taxonomy Taxonomy name.
+	 * @param int    $term_id Term id.
+	 * @param bool   $is_variation_attribute True if the taxonomy corresponds to an attribute used to define variations.
+	 * @param bool   $has_stock True if the product is in stock.
+	 */
+	private function insert_lookup_table_data( int $product_id, int $product_or_parent_id, string $taxonomy, int $term_id, bool $is_variation_attribute, bool $has_stock ) {
+		global $wpdb;
+
+		// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
+		$wpdb->query(
+			$wpdb->prepare(
+				'INSERT INTO ' . $this->lookup_table_name . ' (
+					  product_id,
+					  product_or_parent_id,
+					  taxonomy,
+					  term_id,
+					  is_variation_attribute,
+					  in_stock)
+					VALUES
+					  ( %d, %d, %s, %d, %d, %d )',
+				$product_id,
+				$product_or_parent_id,
+				$taxonomy,
+				$term_id,
+				$is_variation_attribute ? 1 : 0,
+				$has_stock ? 1 : 0
+			)
+		);
+		// phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
+	}
+}
diff --git a/src/Internal/ThemeSupport.php b/src/Internal/ThemeSupport.php
new file mode 100644
index 00000000000..46e627eb137
--- /dev/null
+++ b/src/Internal/ThemeSupport.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * ThemeSupport class file.
+ *
+ * @package Automattic\WooCommerce\ThemeManagement
+ */
+
+namespace Automattic\WooCommerce\Internal;
+
+use Automattic\WooCommerce\Proxies\LegacyProxy;
+use Automattic\WooCommerce\Utilities\ArrayUtil;
+
+/**
+ * Provides methods for theme support.
+ */
+class ThemeSupport {
+
+	const DEFAULTS_KEY = '_defaults';
+
+	/**
+	 * The instance of LegacyProxy to use.
+	 *
+	 * @var LegacyProxy
+	 */
+	private $legacy_proxy;
+
+	/**
+	 * ThemeSupport constructor.
+	 *
+	 * @internal
+	 * @param LegacyProxy $legacy_proxy The instance of LegacyProxy to use.
+	 */
+	final public function init( LegacyProxy $legacy_proxy ) {
+		$this->legacy_proxy = $legacy_proxy;
+	}
+
+	/**
+	 * Adds theme support options for the current theme.
+	 *
+	 * @param array $options The options to be added.
+	 */
+	public function add_options( $options ) {
+		$this->legacy_proxy->call_function( 'add_theme_support', 'woocommerce', $options );
+	}
+
+	/**
+	 * Adds default theme support options for the current theme.
+	 *
+	 * @param array $options The options to be added.
+	 */
+	public function add_default_options( $options ) {
+		$default_options = $this->get_option( self::DEFAULTS_KEY, array() );
+		$default_options = array_merge( $default_options, $options );
+		$this->add_options( array( self::DEFAULTS_KEY => $default_options ) );
+	}
+
+	/**
+	 * Gets "theme support" options from the current theme, if set.
+	 *
+	 * @param string $option_name Option name, possibly nested (key::subkey), to get specific value. Blank to get all the existing options as an array.
+	 * @param mixed  $default_value Value to return if the specified option doesn't exist.
+	 * @return mixed The retrieved option or the default value.
+	 */
+	public function get_option( $option_name = '', $default_value = null ) {
+		$theme_support_options = $this->get_all_options();
+
+		if ( ! $theme_support_options ) {
+			return $default_value;
+		}
+
+		if ( $option_name ) {
+			$value = ArrayUtil::get_nested_value( $theme_support_options, $option_name );
+			if ( is_null( $value ) ) {
+				$value = ArrayUtil::get_nested_value( $theme_support_options, self::DEFAULTS_KEY . '::' . $option_name, $default_value );
+			}
+			return $value;
+		}
+
+		return $theme_support_options;
+	}
+
+	/**
+	 * Checks whether a given theme support option has been defined.
+	 *
+	 * @param string $option_name The (possibly nested) name of the option to check.
+	 * @param bool   $include_defaults True to include the default values in the check, false otherwise.
+	 *
+	 * @return bool True if the specified theme support option has been defined, false otherwise.
+	 */
+	public function has_option( $option_name, $include_defaults = true ) {
+		$theme_support_options = $this->get_all_options();
+
+		if ( ! $theme_support_options ) {
+			return false;
+		}
+
+		$value = ArrayUtil::get_nested_value( $theme_support_options, $option_name );
+		if ( ! is_null( $value ) ) {
+			return true;
+		}
+
+		if ( ! $include_defaults ) {
+			return false;
+		}
+		$value = ArrayUtil::get_nested_value( $theme_support_options, self::DEFAULTS_KEY . '::' . $option_name );
+		return ! is_null( $value );
+	}
+
+	/**
+	 * Get all the defined theme support options for the 'woocommerce' feature.
+	 *
+	 * @return array An array with all the theme support options defined for the 'woocommerce' feature, or false if nothing has been defined for that feature.
+	 */
+	private function get_all_options() {
+		$theme_support = $this->legacy_proxy->call_function( 'get_theme_support', 'woocommerce' );
+		return is_array( $theme_support ) ? $theme_support[0] : false;
+	}
+}
diff --git a/src/Utilities/ArrayUtil.php b/src/Utilities/ArrayUtil.php
new file mode 100644
index 00000000000..8f63dbd5f89
--- /dev/null
+++ b/src/Utilities/ArrayUtil.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * A class of utilities for dealing with arrays.
+ */
+
+namespace Automattic\WooCommerce\Utilities;
+
+/**
+ * A class of utilities for dealing with arrays.
+ */
+class ArrayUtil {
+	/**
+	 * Get a value from an nested array by specifying the entire key hierarchy with '::' as separator.
+	 *
+	 * E.g. for [ 'foo' => [ 'bar' => [ 'fizz' => 'buzz' ] ] ] the value for key 'foo::bar::fizz' would be 'buzz'.
+	 *
+	 * @param array  $array The array to get the value from.
+	 * @param string $key The complete key hierarchy, using '::' as separator.
+	 * @param mixed  $default The value to return if the key doesn't exist in the array.
+	 *
+	 * @return mixed The retrieved value, or the supplied default value.
+	 * @throws \Exception $array is not an array.
+	 */
+	public static function get_nested_value( array $array, string $key, $default = null ) {
+		$key_stack = explode( '::', $key );
+		$subkey    = array_shift( $key_stack );
+
+		if ( isset( $array[ $subkey ] ) ) {
+			$value = $array[ $subkey ];
+
+			if ( count( $key_stack ) ) {
+				foreach ( $key_stack as $subkey ) {
+					if ( is_array( $value ) && isset( $value[ $subkey ] ) ) {
+						$value = $value[ $subkey ];
+					} else {
+						$value = $default;
+						break;
+					}
+				}
+			}
+		} else {
+			$value = $default;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Checks if a given key exists in an array and its value can be evaluated as 'true'.
+	 *
+	 * @param array  $array The array to check.
+	 * @param string $key The key for the value to check.
+	 * @return bool True if the key exists in the array and the value can be evaluated as 'true'.
+	 */
+	public static function is_truthy( array $array, string $key ) {
+		return isset( $array[ $key ] ) && $array[ $key ];
+	}
+
+	/**
+	 * Gets the value for a given key from an array, or a default value if the key doesn't exist in the array.
+	 *
+	 * @param array  $array The array to get the value from.
+	 * @param string $key The key to use to retrieve the value.
+	 * @param null   $default The default value to return if the key doesn't exist in the array.
+	 * @return mixed|null The value for the key, or the default value passed.
+	 */
+	public static function get_value_or_default( array $array, string $key, $default = null ) {
+		return isset( $array[ $key ] ) ? $array[ $key ] : $default;
+	}
+}
+
diff --git a/templates/single-product/add-to-cart/grouped.php b/templates/single-product/add-to-cart/grouped.php
index 39df2ceb456..fb6fff7a6fc 100644
--- a/templates/single-product/add-to-cart/grouped.php
+++ b/templates/single-product/add-to-cart/grouped.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 4.0.0
+ * @version 4.8.0
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/tests/Tools/FakeQueue.php b/tests/Tools/FakeQueue.php
new file mode 100644
index 00000000000..a8dd9151b55
--- /dev/null
+++ b/tests/Tools/FakeQueue.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * FakeQueue class file.
+ *
+ * @package WooCommerce\Testing\Tools
+ */
+
+namespace Automattic\WooCommerce\Testing\Tools;
+
+/**
+ * Fake scheduled actions queue for unit tests, it just records all the method calls
+ * in a publicly accessible $methods_called property.
+ *
+ * To use:
+ *
+ * 1. The production class must get an instance of the queue in this way:
+ *
+ * WC()->get_instance_of(\WC_Queue::class)
+ *
+ * 2. Add the following in the setUp() method of the unit tests class:
+ *
+ * $this->register_legacy_proxy_class_mocks([\WC_Queue::class => new FakeQueue()]);
+ *
+ * 3. Get the instance of the fake queue with $this->get_legacy_instance_of(\WC_Queue::class)
+ *    and check its methods_called field as appropriate.
+ */
+class FakeQueue implements \WC_Queue_Interface {
+
+	/**
+	 * Records all the method calls to this instance.
+	 *
+	 * @var array
+	 */
+	public $methods_called = array();
+
+	// phpcs:disable Squiz.Commenting.FunctionComment.Missing
+
+	public function add( $hook, $args = array(), $group = '' ) {
+		// TODO: Implement add() method.
+	}
+
+	public function schedule_single( $timestamp, $hook, $args = array(), $group = '' ) {
+		$this->add_to_methods_called(
+			'schedule_single',
+			$args,
+			$group,
+			array(
+				'timestamp' => $timestamp,
+				'hook'      => $hook,
+			)
+		);
+	}
+
+	public function schedule_recurring( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) {
+		// TODO: Implement schedule_recurring() method.
+	}
+
+	public function schedule_cron( $timestamp, $cron_schedule, $hook, $args = array(), $group = '' ) {
+		// TODO: Implement schedule_cron() method.
+	}
+
+	public function cancel( $hook, $args = array(), $group = '' ) {
+		// TODO: Implement cancel() method.
+	}
+
+	public function cancel_all( $hook, $args = array(), $group = '' ) {
+		// TODO: Implement cancel_all() method.
+	}
+
+	public function get_next( $hook, $args = null, $group = '' ) {
+		// TODO: Implement get_next() method.
+	}
+
+	public function search( $args = array(), $return_format = OBJECT ) {
+		// TODO: Implement search() method.
+	}
+
+	// phpcs:enable Squiz.Commenting.FunctionComment.Missing
+
+	/**
+	 * Registers a method call for this instance.
+	 *
+	 * @param string $method Name of the invoked method.
+	 * @param array  $args Arguments passed in '$args' to the method call.
+	 * @param string $group Group name passed in '$group' to the method call.
+	 * @param array  $extra_args Any extra information to store about the method call.
+	 */
+	private function add_to_methods_called( $method, $args, $group, $extra_args = array() ) {
+		$value = array(
+			'method' => $method,
+			'args'   => $args,
+			'group'  => $group,
+		);
+
+		$this->methods_called[] = array_merge( $value, $extra_args );
+	}
+}
diff --git a/tests/e2e/api/CHANGELOG.md b/tests/e2e/api/CHANGELOG.md
index a2c57debaf4..605741512f5 100644
--- a/tests/e2e/api/CHANGELOG.md
+++ b/tests/e2e/api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Unreleased
 
+## Added
+
+- Support for orders.
+
+## Changed
+
+- `delete()` now deletes products and coupons instead of moving to `trash`.
 
 # 0.1.2
 
@@ -14,7 +21,7 @@
 
 ## Breaking Changes
 
-- The `HTTPClientFactory` API was changed to make it easier to configure instances with
+- The `HTTPClientFactory` API was changed to make it easier to configure instances
 
 ## Added
 
diff --git a/tests/e2e/api/README.md b/tests/e2e/api/README.md
index 7eadd2d5de1..21398557049 100644
--- a/tests/e2e/api/README.md
+++ b/tests/e2e/api/README.md
@@ -6,7 +6,7 @@ features:
 - [x] TypeScript Definitions
 - [x] Axios API Client with support for OAuth & basic auth
 - [x] Repositories to simplify interaction with basic data types
-- [ ] Service classes for common activities such as changing settings
+- [x] Service classes for common activities such as changing settings
 
 ## Usage
 
@@ -51,12 +51,20 @@ httpClient.get( '/wc/v3/products' ).then( ( response ) => {
 
 As a convenience utility we've created repositories for core data types that can simplify interacting with the API:
 
+#### Parent/Base Repositories
+
 - `SimpleProduct`
 - `ExternalProduct`
 - `GroupedProduct`
 - `VariableProduct`
-- `ProductVariation`
 - `Coupon`
+- `Order`
+- `SettingsGroup`
+
+#### Child Repositories
+
+- `ProductVariation`
+- `Setting`
 
 These repositories provide CRUD methods for ease-of-use:
 
@@ -80,7 +88,7 @@ product.id;
 
 #### Repository Methods
 
-The following methods are available on all repositories:
+The following methods are available on all repositories if the corresponding method is available on the API endpoint:
 
 - `create( {...properties} )` - Create a single object of the model type
 - `delete( objectId )` - Delete a single object of the model type
@@ -90,14 +98,14 @@ The following methods are available on all repositories:
 
 #### Child Repositories
 
-`ProductVariation` is a child model repository. In child model repositories, each method requires the `parentId` as the first parameter:
+In child model repositories, each method requires the `parentId` as the first parameter:
 
 ```javascript
 import { HTTPClientFactory, VariableProduct, ProductVariation } from '@woocommerce/api';
 
 const httpClient = HTTPClientFactory.build( 'https://example.com' )
     .withBasicAuth( 'username', 'password' )
-	.withIndexPermalinks()
+    .withIndexPermalinks()
     .create();
 
 const productRepository = VariableProduct.restRepository( httpClient );
diff --git a/tests/e2e/api/package-lock.json b/tests/e2e/api/package-lock.json
index 8fe554d6176..cd78161ce13 100644
--- a/tests/e2e/api/package-lock.json
+++ b/tests/e2e/api/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@woocommerce/api",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2101,9 +2101,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "html-encoding-sniffer": {
@@ -3083,9 +3083,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
     "lodash.memoize": {
@@ -4895,9 +4895,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
       "dev": true
     },
     "yargs": {
diff --git a/tests/e2e/api/src/models/coupons/coupon.ts b/tests/e2e/api/src/models/coupons/coupon.ts
index a0ee904de29..20e3f42ee9b 100644
--- a/tests/e2e/api/src/models/coupons/coupon.ts
+++ b/tests/e2e/api/src/models/coupons/coupon.ts
@@ -12,6 +12,7 @@ import {
 import {
 	CouponUpdateParams,
 } from './shared';
+import { ObjectLinks } from '../shared-types';
 
 /**
  * The parameters embedded in this generic can be used in the ModelRepository in order to give
@@ -222,6 +223,16 @@ export class Coupon extends Model {
 	 */
 	public readonly usedBy: Array<string> = [];
 
+	/**
+	 * The coupon's links.
+	 *
+	 * @type {ReadonlyArray.<ObjectLinks>}
+	 */
+	public readonly links: ObjectLinks = {
+		collection: [ { href: '' } ],
+		self: [ { href: '' } ],
+	};
+
 	/**
 	 * Creates a new coupon instance with the given properties
 	 *
diff --git a/tests/e2e/api/src/models/index.ts b/tests/e2e/api/src/models/index.ts
index 13ce569f196..902fdec58e3 100644
--- a/tests/e2e/api/src/models/index.ts
+++ b/tests/e2e/api/src/models/index.ts
@@ -3,3 +3,4 @@ export * from './model';
 export * from './settings';
 export * from './shared-types';
 export * from './coupons';
+export * from './orders';
diff --git a/tests/e2e/api/src/models/orders/index.ts b/tests/e2e/api/src/models/orders/index.ts
new file mode 100644
index 00000000000..d4df1e6ca90
--- /dev/null
+++ b/tests/e2e/api/src/models/orders/index.ts
@@ -0,0 +1,2 @@
+export * from './orders';
+export * from './shared';
diff --git a/tests/e2e/api/src/models/orders/orders.ts b/tests/e2e/api/src/models/orders/orders.ts
new file mode 100644
index 00000000000..d23c4ca7611
--- /dev/null
+++ b/tests/e2e/api/src/models/orders/orders.ts
@@ -0,0 +1,369 @@
+import { HTTPClient } from '../../http';
+import { orderRESTRepository } from '../../repositories';
+import {
+	ModelRepositoryParams,
+	CreatesModels,
+	ListsModels,
+	ReadsModels,
+	UpdatesModels,
+	DeletesModels,
+} from '../../framework';
+import {
+	OrderAddressUpdateParams,
+	OrderCouponUpdateParams,
+	OrderDataUpdateParams,
+	OrderFeeUpdateParams,
+	OrderLineItemUpdateParams,
+	OrderRefundUpdateParams,
+	OrderShippingUpdateParams,
+	OrderTaxUpdateParams,
+	OrderTotalUpdateParams,
+	OrderItemMeta,
+	OrderAddress,
+	OrderCouponLine,
+	OrderFeeLine,
+	OrderLineItem,
+	OrderRefundLine,
+	OrderShippingLine,
+	OrderStatus,
+	OrderTaxRate,
+} from './shared';
+import { ObjectLinks } from '../shared-types';
+
+/**
+ * The parameters that orders can update.
+ */
+type OrderUpdateParams = OrderAddressUpdateParams
+	& OrderCouponUpdateParams
+	& OrderDataUpdateParams
+	& OrderFeeUpdateParams
+	& OrderLineItemUpdateParams
+	& OrderRefundUpdateParams
+	& OrderShippingUpdateParams
+	& OrderTaxUpdateParams
+	& OrderTotalUpdateParams;
+
+/**
+ * The parameters embedded in this generic can be used in the ModelRepository in order to give
+ * type-safety in an incredibly granular way.
+ */
+export type OrderRepositoryParams = ModelRepositoryParams< Order, never, never, OrderUpdateParams >;
+
+/**
+ * An interface for creating orders using the repository.
+ *
+ * @typedef CreatesOrders
+ * @alias CreatesModels.<Order>
+ */
+export type CreatesOrders = CreatesModels< OrderRepositoryParams >;
+
+/**
+ * An interface for reading orders using the repository.
+ *
+ * @typedef ReadsOrders
+ * @alias ReadsModels.<Order>
+ */
+export type ReadsOrders = ReadsModels< OrderRepositoryParams >;
+
+/**
+ * An interface for updating orders using the repository.
+ *
+ * @typedef UpdatesOrders
+ * @alias UpdatesModels.<Order>
+ */
+export type UpdatesOrders = UpdatesModels< OrderRepositoryParams >;
+
+/**
+ * An interface for listing orders using the repository.
+ *
+ * @typedef ListsOrders
+ * @alias ListsModels.<Order>
+ */
+export type ListsOrders = ListsModels< OrderRepositoryParams >;
+
+/**
+ * An interface for deleting orders using the repository.
+ *
+ * @typedef DeletesOrders
+ * @alias DeletesModels.<Orders>
+ */
+export type DeletesOrders = DeletesModels< OrderRepositoryParams >;
+
+/**
+ * An order object.
+ */
+export class Order extends OrderItemMeta {
+	/**
+	 * The parent order id.
+	 *
+	 * @type {number}
+	 */
+	public readonly parentId: number = 0;
+
+	/**
+	 * The order status.
+	 *
+	 * @type {string}
+	 */
+	public readonly status: OrderStatus = '';
+
+	/**
+	 * The order currency.
+	 *
+	 * @type {string}
+	 */
+	public readonly currency: string = '';
+
+	/**
+	 * The WC version used to create the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly version: string = '';
+
+	/**
+	 * Flags if the prices include tax.
+	 *
+	 * @type {boolean}
+	 */
+	public readonly pricesIncludeTax: boolean = false;
+
+	/**
+	 * The total of the discounts on the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly discountTotal: string = '';
+
+	/**
+	 * The total of the tax on discounts on the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly discountTax: string = '';
+
+	/**
+	 * The total of the shipping on the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly shippingTotal: string = '';
+
+	/**
+	 * The total of the tax on shipping on the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly shippingTax: string = '';
+
+	/**
+	 * The total cart tax on the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly cartTax: string = '';
+
+	/**
+	 * The total for the order including adjustments.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+
+	/**
+	 * The total tax for the order including adjustments.
+	 *
+	 * @type {string}
+	 */
+	public readonly totalTax: string = '';
+
+	/**
+	 * The customer id.
+	 *
+	 * @type {number}
+	 */
+	public readonly customerId: number = 0;
+
+	/**
+	 * A unique key assigned to the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly orderKey: string = '';
+
+	/**
+	 * The billing address.
+	 *
+	 * @type {OrderAddress}
+	 */
+	public readonly billing: OrderAddress | null = null;
+
+	/**
+	 * The shipping address.
+	 *
+	 * @type {OrderAddress}
+	 */
+	public readonly shipping: OrderAddress | null = null;
+
+	/**
+	 * Name of the payment method.
+	 *
+	 * @type {string}
+	 */
+	public readonly paymentMethod: string = '';
+
+	/**
+	 * Title of the payment method
+	 *
+	 * @type {string}
+	 */
+	public readonly paymentMethodTitle: string = '';
+
+	/**
+	 * Payment transaction ID.
+	 *
+	 * @type {string}
+	 */
+	public readonly transactionId: string = '';
+
+	/**
+	 * Customer IP address.
+	 *
+	 * @type {string}
+	 */
+	public readonly customerIpAddress: string = '';
+
+	/**
+	 * Customer web browser user agent.
+	 *
+	 * @type {string}
+	 */
+	public readonly customerUserAgent: string = '';
+
+	/**
+	 * Method used to create the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly createdVia: string = '';
+
+	/**
+	 * Customer note.
+	 *
+	 * @type {string}
+	 */
+	public readonly customerNote: string = '';
+
+	/**
+	 * Date the order was completed.
+	 *
+	 * @type {string}
+	 */
+	public readonly dateCompleted: Date | null = null;
+
+	/**
+	 * Date the order was paid.
+	 *
+	 * @type {string}
+	 */
+	public readonly datePaid: Date | null = null;
+
+	/**
+	 * Hash of the cart's contents.
+	 *
+	 * @type {string}
+	 */
+	public readonly cartHash: string = '';
+
+	/**
+	 * Number assigned to the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly orderNumber: string = '';
+
+	/**
+	 * Currency symbol for the order.
+	 *
+	 * @type {string}
+	 */
+	public readonly currencySymbol: string = '';
+
+	/**
+	 * The order's paid state.
+	 *
+	 * @type {boolean}
+	 */
+	public readonly setPaid: boolean = false;
+
+	/**
+	 * The order's line items.
+	 *
+	 * @type {ReadonlyArray.<OrderLineItem>}
+	 */
+	public readonly lineItems: OrderLineItem[] = [];
+
+	/**
+	 * The order's tax rates.
+	 *
+	 * @type {ReadonlyArray.<OrderTaxRate>}
+	 */
+	public readonly taxLines: OrderTaxRate[] = [];
+
+	/**
+	 * The order's shipping charges.
+	 *
+	 * @type {ReadonlyArray.<OrderShippingLine>}
+	 */
+	public readonly shippingLines: OrderShippingLine[] = [];
+
+	/**
+	 * The order's fees.
+	 *
+	 * @type {ReadonlyArray.<OrderFeeLine>}
+	 */
+	public readonly feeLines: OrderFeeLine[] = [];
+
+	/**
+	 * The coupons used on the order.
+	 *
+	 * @type {ReadonlyArray.<OrderCouponLine>}
+	 */
+	public readonly couponLines: OrderCouponLine[] = [];
+
+	/**
+	 * The refunds to the order.
+	 *
+	 * @type {ReadonlyArray.<OrderRefundLine>}
+	 */
+	public readonly refunds: OrderRefundLine[] = [];
+
+	/**
+	 * The order's links.
+	 *
+	 * @type {ReadonlyArray.<ObjectLinks>}
+	 */
+	public readonly links: ObjectLinks = {
+		collection: [ { href: '' } ],
+		self: [ { href: '' } ],
+	};
+
+	/**
+	 * Creates a new order instance with the given properties
+	 *
+	 * @param {Object} properties The properties to set in the object.
+	 */
+	public constructor( properties?: Partial< Order > ) {
+		super();
+		Object.assign( this, properties );
+	}
+
+	/**
+	 * Returns the repository for interacting with this type of model.
+	 *
+	 * @param {HTTPClient} httpClient The client for communicating via HTTP.
+	 */
+	public static restRepository( httpClient: HTTPClient ): ReturnType< typeof orderRESTRepository > {
+		return orderRESTRepository( httpClient );
+	}
+}
diff --git a/tests/e2e/api/src/models/orders/shared/classes.ts b/tests/e2e/api/src/models/orders/shared/classes.ts
new file mode 100644
index 00000000000..540c543d4ae
--- /dev/null
+++ b/tests/e2e/api/src/models/orders/shared/classes.ts
@@ -0,0 +1,412 @@
+import { MetaData } from '../../shared-types';
+import { Model } from '../../model';
+import { TaxStatus } from './types';
+
+/**
+ * Order item meta.
+ */
+export class OrderItemMeta extends Model {
+	/**
+	 * The meta data the order item.
+	 *
+	 * @type {ReadonlyArray.<MetaData>}
+	 */
+	public readonly metaData: MetaData[] = [];
+}
+
+/**
+ * Order line item tax entry.
+ */
+export class OrderItemTax extends Model {
+	/**
+	 * The total tax for this tax rate on this item.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+
+	/**
+	 * The subtotal tax for this tax rate on this item.
+	 *
+	 * @type {string}
+	 */
+	public readonly subtotal: string = '';
+}
+
+/**
+ * An order address.
+ */
+export class OrderAddress extends Model {
+	/**
+	 * The first name of the person in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly firstName: string = '';
+
+	/**
+	 * The last name of the person in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly lastName: string = '';
+
+	/**
+	 * The company name of the person in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly companyName: string = '';
+
+	/**
+	 * The first address line in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly address1: string = '';
+
+	/**
+	 * The second address line in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly address2: string = '';
+
+	/**
+	 * The city in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly city: string = '';
+
+	/**
+	 * The state in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly state: string = '';
+
+	/**
+	 * The postal code in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly postCode: string = '';
+
+	/**
+	 * The country code for the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly countryCode: string = '';
+
+	/**
+	 * The email address of the person in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly email: string = '';
+
+	/**
+	 * The phone number of the person in the address.
+	 *
+	 * @type {string}
+	 */
+	public readonly phone: string = '';
+}
+
+/**
+ * Order Line Item
+ */
+export class OrderLineItem extends OrderItemMeta {
+	/**
+	 * The name of the product.
+	 *
+	 * @type {string}
+	 */
+	public readonly name: string = '';
+
+	/**
+	 * The ID of the product.
+	 *
+	 * @type {number}
+	 */
+	public readonly productId: number = -1;
+
+	/**
+	 * The ID of the product variation.
+	 *
+	 * @type {number}
+	 */
+	public readonly variationId: number = 0;
+
+	/**
+	 * The quantity of the product.
+	 *
+	 * @type {number}
+	 */
+	public readonly quantity: number = -1;
+
+	/**
+	 * The tax class for the product.
+	 *
+	 * @type {string}
+	 */
+	public readonly taxClass: string = '';
+
+	/**
+	 * The subtotal for the product.
+	 *
+	 * @type {string}
+	 */
+	public readonly subtotal: string = '';
+
+	/**
+	 * The subtotal tax for the product.
+	 *
+	 * @type {string}
+	 */
+	public readonly subtotalTax: string = '';
+
+	/**
+	 * The total for the product including adjustments.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+
+	/**
+	 * The total tax for the product including adjustments.
+	 *
+	 * @type {string}
+	 */
+	public readonly totalTax: string = '';
+
+	/**
+	 * The taxes applied to the product.
+	 *
+	 * @type {ReadonlyArray.<OrderItemTax>}
+	 */
+	public readonly taxes: OrderItemTax[] = [];
+
+	/**
+	 * The product SKU.
+	 *
+	 * @type {string}
+	 */
+	public readonly sku: string = '';
+
+	/**
+	 * The price of the product.
+	 *
+	 * @type {number}
+	 */
+	public readonly price: number = -1;
+
+	/**
+	 * The name of the parent product.
+	 *
+	 * @type {string|null}
+	 */
+	public readonly parentName: string | null = null;
+}
+
+/**
+ * Order Tax Rate
+ */
+export class OrderTaxRate extends Model {
+	/**
+	 * The tax rate code.
+	 *
+	 * @type {string}
+	 */
+	public readonly rateCode: string = '';
+
+	/**
+	 * The tax rate id.
+	 *
+	 * @type {number}
+	 */
+	public readonly rateId: number = 0;
+
+	/**
+	 * The tax label.
+	 *
+	 * @type {string}
+	 */
+	public readonly label: string = '';
+
+	/**
+	 * Flag indicating whether it's a compound tax rate.
+	 *
+	 * @type {boolean}
+	 */
+	public readonly compoundRate: boolean = false;
+
+	/**
+	 * The total tax for this rate code.
+	 *
+	 * @type {string}
+	 */
+	public readonly taxTotal: string = '';
+
+	/**
+	 * The total shipping tax for this rate code.
+	 *
+	 * @type {string}
+	 */
+	public readonly shippingTaxTotal: string = '';
+
+	/**
+	 * The tax rate as a percentage.
+	 *
+	 * @type {number}
+	 */
+	public readonly ratePercent: number = 0;
+}
+
+/**
+ * Order shipping line
+ */
+export class OrderShippingLine extends OrderItemMeta {
+	/**
+	 * The shipping method title.
+	 *
+	 * @type {string}
+	 */
+	public readonly methodTitle: string = '';
+
+	/**
+	 * The shipping method id.
+	 *
+	 * @type {string}
+	 */
+	public readonly methodId: string = '';
+
+	/**
+	 * The shipping method instance id.
+	 *
+	 * @type {string}
+	 */
+	public readonly instanceId: string = '';
+
+	/**
+	 * The total shipping amount for this method.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+
+	/**
+	 * The total tax amount for this shipping method.
+	 *
+	 * @type {string}
+	 */
+	public readonly totalTax: string = '';
+
+	/**
+	 * The taxes applied to this shipping method.
+	 *
+	 * @type {ReadonlyArray.<OrderItemTax>}
+	 */
+	public readonly taxes: OrderItemTax[] = [];
+}
+
+/**
+ * Order fee line
+ */
+export class OrderFeeLine extends OrderItemMeta {
+	/**
+	 * The name of the fee.
+	 *
+	 * @type {string}
+	 */
+	public readonly name: string = '';
+
+	/**
+	 * The tax class of the fee.
+	 *
+	 * @type {string}
+	 */
+	public readonly taxClass: string = '';
+
+	/**
+	 * The tax status of the fee.
+	 *
+	 * @type {TaxStatus}
+	 */
+	public readonly taxStatus: TaxStatus = 'taxable';
+
+	/**
+	 * The total amount for this fee.
+	 *
+	 * @type {string}
+	 */
+	public readonly amount: string = '';
+
+	/**
+	 * The display total amount for this fee.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+
+	/**
+	 * The total tax amount for this fee.
+	 *
+	 * @type {string}
+	 */
+	public readonly totalTax: string = '';
+
+	/**
+	 * The taxes applied to this fee.
+	 *
+	 * @type {ReadonlyArray.<OrderItemTax>}
+	 */
+	public readonly taxes: OrderItemTax[] = [];
+}
+
+/**
+ * Order coupon line
+ */
+export class OrderCouponLine extends OrderItemMeta {
+	/**
+	 * The coupon code
+	 *
+	 * @type {string}
+	 */
+	public readonly code: string = '';
+
+	/**
+	 * The discount amount.
+	 *
+	 * @type {string}
+	 */
+	public readonly discount: string = '';
+
+	/**
+	 * The discount tax.
+	 *
+	 * @type {string}
+	 */
+	public readonly discountTax: string = '';
+}
+
+/**
+ * Order refund line
+ */
+export class OrderRefundLine extends Model {
+	/**
+	 * The reason for giving the refund.
+	 *
+	 * @type {string}
+	 */
+	public readonly reason: string = '';
+
+	/**
+	 * The total amount of the refund.
+	 *
+	 * @type {string}
+	 */
+	public readonly total: string = '';
+}
diff --git a/tests/e2e/api/src/models/orders/shared/index.ts b/tests/e2e/api/src/models/orders/shared/index.ts
new file mode 100644
index 00000000000..15eb796c953
--- /dev/null
+++ b/tests/e2e/api/src/models/orders/shared/index.ts
@@ -0,0 +1,2 @@
+export * from './classes';
+export * from './types';
diff --git a/tests/e2e/api/src/models/orders/shared/types.ts b/tests/e2e/api/src/models/orders/shared/types.ts
new file mode 100644
index 00000000000..adeba0128c4
--- /dev/null
+++ b/tests/e2e/api/src/models/orders/shared/types.ts
@@ -0,0 +1,66 @@
+/**
+ * An order's status.
+ *
+ * @typedef OrderStatus
+ */
+export type OrderStatus = 'pending' | 'processing' | 'complete' | 'on-hold' | 'refunded'
+	| 'cancelled' | 'failed' | 'trash' | string;
+
+/**
+ * An fee's tax status.
+ *
+ * @typedef TaxStatus
+ */
+export type TaxStatus = 'taxable' | 'none';
+
+/**
+ * Base order properties
+ */
+export type OrderDataUpdateParams = 'id' | 'parentId' | 'status' | 'currency' | 'version'
+	| 'pricesIncludeTax' | 'discountTotal' | 'discountTax' | 'shippingTotal' | 'shippingTax'
+	| 'cartTax' | 'customerId' | 'orderKey' | 'paymentMethod' | 'paymentMethodTitle'
+	| 'transactionId' | 'customerIpAddress' | 'customerUserAgent' | 'createdVia' | 'datePaid'
+	| 'customerNote' | 'dateCompleted' | 'cartHash' | 'orderNumber' | 'currencySymbol';
+
+/**
+ * Common total properties
+ */
+export type OrderTotalUpdateParams = 'total' | 'totalTax';
+
+/**
+ * Order address properties
+ */
+export type OrderAddressUpdateParams = 'firstName' | 'lastName' | 'companyName' | 'address1'
+	| 'address2' | 'city' | 'state' | 'postCode' | 'countryCode' | 'email' | 'phone';
+
+/**
+ * Line item properties
+ */
+export type OrderLineItemUpdateParams = 'name' | 'ProductId' | 'variationId' | 'quantity'
+	| 'taxClass' | 'subtotal' | 'subtotalTax' | 'sku' | 'price' | 'parentName';
+
+/**
+ * Tax rate properties
+ */
+export type OrderTaxUpdateParams = 'rateCode' | 'rateId' | 'label' | 'compoundRate'
+	| 'taxTotal' | 'shippingTaxTotal' | 'ratePercent';
+
+/**
+ * Order shipping properties
+ */
+export type OrderShippingUpdateParams = 'methodTitle' | 'methodId' | 'instanceId';
+
+/**
+ * Order fee properties
+ */
+export type OrderFeeUpdateParams = 'name' | 'taxClass' | 'taxStatus' | 'amount';
+
+/**
+ * Order coupon properties
+ */
+export type OrderCouponUpdateParams = 'code' | 'discount' | 'discountTax';
+
+/**
+ * Order refund properties
+ */
+export type OrderRefundUpdateParams = 'reason' | 'total';
diff --git a/tests/e2e/api/src/models/products/abstract/common.ts b/tests/e2e/api/src/models/products/abstract/common.ts
index d9a4a3525db..bab3e1dc6b7 100644
--- a/tests/e2e/api/src/models/products/abstract/common.ts
+++ b/tests/e2e/api/src/models/products/abstract/common.ts
@@ -3,9 +3,9 @@ import { ModelID } from '../../model';
 import {
 	CatalogVisibility,
 	ProductTerm,
-	ProductLinks,
 	ProductAttribute,
 } from '../shared';
+import { ObjectLinks } from '../../shared-types';
 
 /**
  * The common parameters that all products can use in search.
@@ -145,11 +145,11 @@ export abstract class AbstractProduct extends AbstractProductData {
 	public readonly attributes: readonly ProductAttribute[] = [];
 
 	/**
-	 * The products links.
+	 * The product's links.
 	 *
-	 * @type {ReadonlyArray.<ProductLinks>}
+	 * @type {ReadonlyArray.<ObjectLinks>}
 	 */
-	public readonly links: ProductLinks = {
+	public readonly links: ObjectLinks = {
 		collection: [ { href: '' } ],
 		self: [ { href: '' } ],
 	};
diff --git a/tests/e2e/api/src/models/products/abstract/data.ts b/tests/e2e/api/src/models/products/abstract/data.ts
index 0d1b83cb37e..e76c1c7d9d8 100644
--- a/tests/e2e/api/src/models/products/abstract/data.ts
+++ b/tests/e2e/api/src/models/products/abstract/data.ts
@@ -1,6 +1,6 @@
 import { Model } from '../../model';
-import { MetaData, PostStatus } from '../../shared-types';
-import { ProductImage, ProductLinks } from '../shared';
+import { MetaData, PostStatus, ObjectLinks } from '../../shared-types';
+import { ProductImage } from '../shared';
 
 /**
  * Base product data.
@@ -93,9 +93,9 @@ export abstract class AbstractProductData extends Model {
 	/**
 	 * The product data links.
 	 *
-	 * @type {ReadonlyArray.<ProductLinks>}
+	 * @type {ReadonlyArray.<ObjectLinks>}
 	 */
-	public readonly links: ProductLinks = {
+	public readonly links: ObjectLinks = {
 		collection: [ { href: '' } ],
 		self: [ { href: '' } ],
 	};
diff --git a/tests/e2e/api/src/models/products/shared/classes.ts b/tests/e2e/api/src/models/products/shared/classes.ts
index 7343c594352..c08e0a20b70 100644
--- a/tests/e2e/api/src/models/products/shared/classes.ts
+++ b/tests/e2e/api/src/models/products/shared/classes.ts
@@ -208,59 +208,3 @@ export class ProductImage {
 		Object.assign( this, properties );
 	}
 }
-
-/**
- * A product link item.
- */
-class ProductLinkItem {
-	/**
-	 * The options which are available for the attribute.
-	 *
-	 * @type {ReadonlyArray.<string>}
-	 */
-	public readonly href: string = '';
-
-	/**
-	 * Creates a new product link item.
-	 *
-	 * @param {Partial.<ProductLinkItem>} properties The properties to set.
-	 */
-	public constructor( properties?: Partial< ProductLinkItem > ) {
-		Object.assign( this, properties );
-	}
-}
-
-/**
- * A product's links.
- */
-export class ProductLinks {
-	/**
-	 * The collection containing the product.
-	 *
-	 * @type {ReadonlyArray.<ProductLinkItem>}
-	 */
-	public readonly collection: readonly ProductLinkItem[] = [];
-
-	/**
-	 * Self referential link to the product.
-	 *
-	 * @type {ReadonlyArray.<ProductLinkItem>}
-	 */
-	public readonly self: readonly ProductLinkItem[] = [];
-
-	/**
-	 * The link to the parent.
-	 *
-	 * @type {ReadonlyArray.<ProductLinkItem>}
-	 */
-	public readonly up?: readonly ProductLinkItem[] = [];
-
-	/**
-	 * Creates a new product link list.
-	 *
-	 * @param {Partial.<ProductLinks>} properties The properties to set.
-	 */
-	public constructor( properties?: Partial< ProductLinks > ) {
-		Object.assign( this, properties );
-	}
-}
diff --git a/tests/e2e/api/src/models/products/variation.ts b/tests/e2e/api/src/models/products/variation.ts
index 78e8580c2fa..beb1bad8071 100644
--- a/tests/e2e/api/src/models/products/variation.ts
+++ b/tests/e2e/api/src/models/products/variation.ts
@@ -15,13 +15,13 @@ import {
 	ProductPriceUpdateParams,
 	ProductSalesTaxUpdateParams,
 	ProductShippingUpdateParams,
-	ProductLinks,
 	Taxability,
 	ProductDownload,
 	StockStatus,
 	BackorderStatus,
 	ProductDefaultAttribute,
 } from './shared';
+import { ObjectLinks } from '../shared-types';
 import {
 	CreatesChildModels,
 	DeletesChildModels,
@@ -149,11 +149,11 @@ export class ProductVariation extends AbstractProductData implements
 	public readonly shippingClassId: number = 0;
 
 	/**
-	 * The variation links.
+	 * The variation's links.
 	 *
-	 * @type {ReadonlyArray.<ProductLinks>}
+	 * @type {ReadonlyArray.<ObjectLinks>}
 	 */
-	public readonly links: ProductLinks = {
+	public readonly links: ObjectLinks = {
 		collection: [ { href: '' } ],
 		self: [ { href: '' } ],
 		up: [ { href: '' } ],
diff --git a/tests/e2e/api/src/models/shared-types.ts b/tests/e2e/api/src/models/shared-types.ts
index 5f64fff0b72..d041f3c48c8 100644
--- a/tests/e2e/api/src/models/shared-types.ts
+++ b/tests/e2e/api/src/models/shared-types.ts
@@ -35,6 +35,20 @@ export class MetaData extends Model {
 	 */
 	public readonly value: any = '';
 
+	/**
+	 * The key of the metadata.
+	 *
+	 * @type {string}
+	 */
+	public readonly displayKey?: string = '';
+
+	/**
+	 * The value of the metadata.
+	 *
+	 * @type {*}
+	 */
+	public readonly displayValue?: string = '';
+
 	/**
 	 * Creates a new metadata.
 	 *
@@ -45,3 +59,59 @@ export class MetaData extends Model {
 		Object.assign( this, properties );
 	}
 }
+
+/**
+ * An object link item.
+ */
+class LinkItem {
+	/**
+	 * The href of the link.
+	 *
+	 * @type {ReadonlyArray.<string>}
+	 */
+	public readonly href: string = '';
+
+	/**
+	 * Creates a new product link item.
+	 *
+	 * @param {Partial.<LinkItem>} properties The properties to set.
+	 */
+	public constructor( properties?: Partial< LinkItem > ) {
+		Object.assign( this, properties );
+	}
+}
+
+/**
+ * An object's links.
+ */
+export class ObjectLinks {
+	/**
+	 * The collection containing the object.
+	 *
+	 * @type {ReadonlyArray.<LinkItem>}
+	 */
+	public readonly collection: readonly LinkItem[] = [];
+
+	/**
+	 * Self referential link to the object.
+	 *
+	 * @type {ReadonlyArray.<LinkItem>}
+	 */
+	public readonly self: readonly LinkItem[] = [];
+
+	/**
+	 * The link to the parent object.
+	 *
+	 * @type {ReadonlyArray.<LinkItem>}
+	 */
+	public readonly up?: readonly LinkItem[] = [];
+
+	/**
+	 * Creates a new product link list.
+	 *
+	 * @param {Partial.<ObjectLinks>} properties The properties to set.
+	 */
+	public constructor( properties?: Partial< ObjectLinks > ) {
+		Object.assign( this, properties );
+	}
+}
diff --git a/tests/e2e/api/src/repositories/rest/coupons/transformer.ts b/tests/e2e/api/src/repositories/rest/coupons/transformer.ts
index b3827471242..8e0c7d85eb9 100644
--- a/tests/e2e/api/src/repositories/rest/coupons/transformer.ts
+++ b/tests/e2e/api/src/repositories/rest/coupons/transformer.ts
@@ -57,6 +57,7 @@ export function createCouponTransformer(): ModelTransformer< Coupon > {
 					maximumAmount: 'maximum_amount',
 					emailRestrictions: 'email_restrictions',
 					usedBy: 'used_by',
+					links: '_links',
 				},
 			),
 		],
diff --git a/tests/e2e/api/src/repositories/rest/index.ts b/tests/e2e/api/src/repositories/rest/index.ts
index 15f18f10ee0..7ae5c9a38a2 100644
--- a/tests/e2e/api/src/repositories/rest/index.ts
+++ b/tests/e2e/api/src/repositories/rest/index.ts
@@ -1,3 +1,4 @@
-export * from './products';
-export * from './settings';
 export * from './coupons';
+export * from './products';
+export * from './orders';
+export * from './settings';
diff --git a/tests/e2e/api/src/repositories/rest/orders/index.ts b/tests/e2e/api/src/repositories/rest/orders/index.ts
new file mode 100644
index 00000000000..fa4dd50d134
--- /dev/null
+++ b/tests/e2e/api/src/repositories/rest/orders/index.ts
@@ -0,0 +1,3 @@
+import orderRESTRepository from './order';
+
+export { orderRESTRepository };
diff --git a/tests/e2e/api/src/repositories/rest/orders/order.ts b/tests/e2e/api/src/repositories/rest/orders/order.ts
new file mode 100644
index 00000000000..76e29525982
--- /dev/null
+++ b/tests/e2e/api/src/repositories/rest/orders/order.ts
@@ -0,0 +1,47 @@
+import { HTTPClient } from '../../../http';
+import {
+	ModelRepository,
+} from '../../../framework';
+import {
+	ModelID,
+	Order,
+	OrderRepositoryParams,
+	ListsOrders,
+	ReadsOrders,
+	UpdatesOrders,
+	CreatesOrders,
+	DeletesOrders,
+} from '../../../models';
+
+import {
+	restList,
+	restCreate,
+	restRead,
+	restUpdate,
+	restDelete,
+} from '../shared';
+
+import { createOrderTransformer } from './transformer';
+/**
+ *
+ * @param {HTTPClient} httpClient The HTTP client for the REST requests to be made using.
+ */
+export default function orderRESTRepository( httpClient: HTTPClient ): CreatesOrders
+& ListsOrders
+& ReadsOrders
+& UpdatesOrders
+& DeletesOrders {
+	const buildURL = ( id: ModelID ) => '/wc/v3/orders/' + id;
+	// Using `?force=true` permanently deletes the order
+	const buildDeleteUrl = ( id: ModelID ) => `/wc/v3/orders/${ id }?force=true`;
+
+	const transformer = createOrderTransformer();
+
+	return new ModelRepository(
+		restList< OrderRepositoryParams >( () => '/wc/v3/orders', Order, httpClient, transformer ),
+		restCreate< OrderRepositoryParams >( () => '/wc/v3/orders', Order, httpClient, transformer ),
+		restRead< OrderRepositoryParams >( buildURL, Order, httpClient, transformer ),
+		restUpdate< OrderRepositoryParams >( buildURL, Order, httpClient, transformer ),
+		restDelete< OrderRepositoryParams >( buildDeleteUrl, httpClient ),
+	);
+}
diff --git a/tests/e2e/api/src/repositories/rest/orders/transformer.ts b/tests/e2e/api/src/repositories/rest/orders/transformer.ts
new file mode 100644
index 00000000000..5cd3c0e2b6f
--- /dev/null
+++ b/tests/e2e/api/src/repositories/rest/orders/transformer.ts
@@ -0,0 +1,277 @@
+import {
+	IgnorePropertyTransformation,
+	KeyChangeTransformation,
+	ModelTransformer,
+	ModelTransformerTransformation,
+	PropertyType,
+	PropertyTypeTransformation,
+} from '../../../framework';
+import {
+	Order,
+	OrderAddress,
+	OrderCouponLine,
+	OrderFeeLine,
+	OrderLineItem,
+	OrderRefundLine,
+	OrderShippingLine,
+	OrderTaxRate,
+} from '../../../models';
+
+/**
+ * Creates a transformer for an order object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+export function createOrderTransformer(): ModelTransformer< Order > {
+	return new ModelTransformer(
+		[
+			new IgnorePropertyTransformation( [ 'date_created', 'date_modified' ] ),
+			new ModelTransformerTransformation( 'billing', OrderAddress, createOrderAddressTransformer() ),
+			new ModelTransformerTransformation( 'tax_lines', OrderTaxRate, createOrderTaxRateTransformer() ),
+			new ModelTransformerTransformation( 'refunds', OrderRefundLine, createOrderRefundLineTransformer() ),
+			new ModelTransformerTransformation( 'coupon_lines', OrderCouponLine, createOrdeCouponLineTransformer() ),
+			new ModelTransformerTransformation( 'fee_lines', OrderFeeLine, createOrderFeeLineTransformer() ),
+			new ModelTransformerTransformation( 'line_items', OrderLineItem, createOrderLineItemTransformer() ),
+			new ModelTransformerTransformation( 'shipping_lines', OrderShippingLine, createOrderShippingItemTransformer() ),
+
+			new PropertyTypeTransformation(
+				{
+					status: PropertyType.String,
+					currency: PropertyType.String,
+					discountTotal: PropertyType.String,
+					discountTax: PropertyType.String,
+					shippingTotal: PropertyType.String,
+					shippingTax: PropertyType.String,
+					cartTax: PropertyType.String,
+					total: PropertyType.String,
+					totalTax: PropertyType.String,
+					pricesIncludeTax: PropertyType.Boolean,
+					customerId: PropertyType.Integer,
+					customerNote: PropertyType.String,
+					paymentMethod: PropertyType.String,
+					transactionId: PropertyType.String,
+					setPaid: PropertyType.Boolean,
+				},
+			),
+			new KeyChangeTransformation< Order >(
+				{
+					discountTotal: 'discount_total',
+					discountTax: 'discount_tax',
+					shippingTotal: 'shipping_total',
+					shippingTax: 'shipping_tax',
+					cartTax: 'cart_tax',
+					totalTax: 'total_tax',
+					pricesIncludeTax: 'prices_include_tax',
+					customerId: 'customer_id',
+					customerNote: 'customer_note',
+					paymentMethod: 'payment_method',
+					transactionId: 'transaction_id',
+					setPaid: 'set_paid',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order address object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+export function createOrderAddressTransformer(): ModelTransformer< OrderAddress > {
+	return new ModelTransformer(
+		[
+			new PropertyTypeTransformation(
+				{
+					firstName: PropertyType.String,
+					lastName: PropertyType.String,
+					company: PropertyType.String,
+					address1: PropertyType.String,
+					address2: PropertyType.String,
+					city: PropertyType.String,
+					state: PropertyType.String,
+					postCode: PropertyType.String,
+					country: PropertyType.String,
+				},
+			),
+			new KeyChangeTransformation< OrderAddress >(
+				{
+					firstName: 'first_name',
+					lastName: 'last_name',
+					address1: 'address_1',
+					address2: 'address_2',
+					postCode: 'postcode',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order tax rate object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrderTaxRateTransformer(): ModelTransformer< OrderTaxRate > {
+	return new ModelTransformer(
+		[
+			new PropertyTypeTransformation(
+				{
+					rateCode: PropertyType.String,
+					rateId: PropertyType.Integer,
+					label: PropertyType.String,
+					compoundRate: PropertyType.Boolean,
+					taxTotal: PropertyType.String,
+					shippingTaxTotal: PropertyType.String,
+					ratePercent: PropertyType.Integer,
+				},
+			),
+			new KeyChangeTransformation< OrderTaxRate >(
+				{
+					rateCode: 'rate_code',
+					rateId: 'rate_id',
+					compoundRate: 'compound',
+					taxTotal: 'tax_total',
+					shippingTaxTotal: 'shipping_tax_total',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order refund line object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrderRefundLineTransformer(): ModelTransformer< OrderRefundLine > {
+	return new ModelTransformer(
+		[
+			new PropertyTypeTransformation(
+				{
+					reason: PropertyType.String,
+					total: PropertyType.String,
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order coupon line object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrdeCouponLineTransformer(): ModelTransformer< OrderCouponLine > {
+	return new ModelTransformer(
+		[
+			new PropertyTypeTransformation(
+				{
+					code: PropertyType.String,
+					discount: PropertyType.Integer,
+					discountTax: PropertyType.String,
+				},
+			),
+			new KeyChangeTransformation< OrderCouponLine >(
+				{
+					discountTax: 'discount_tax',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order fee line object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrderFeeLineTransformer(): ModelTransformer< OrderFeeLine > {
+	return new ModelTransformer(
+		[
+			new ModelTransformerTransformation( 'taxes', OrderTaxRate, createOrderTaxRateTransformer() ),
+			new PropertyTypeTransformation(
+				{
+					name: PropertyType.String,
+					taxClass: PropertyType.String,
+					taxStatus: PropertyType.String,
+					total: PropertyType.String,
+					totalTax: PropertyType.String,
+				},
+			),
+			new KeyChangeTransformation< OrderFeeLine >(
+				{
+					taxClass: 'tax_class',
+					taxStatus: 'tax_status',
+					totalTax: 'total_tax',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order line item object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrderLineItemTransformer(): ModelTransformer< OrderLineItem > {
+	return new ModelTransformer(
+		[
+			new ModelTransformerTransformation( 'taxes', OrderTaxRate, createOrderTaxRateTransformer() ),
+			new PropertyTypeTransformation(
+				{
+					name: PropertyType.String,
+					productId: PropertyType.Integer,
+					variationId: PropertyType.Integer,
+					quantity: PropertyType.Integer,
+					taxClass: PropertyType.String,
+					subtotal: PropertyType.String,
+					subtotalTax: PropertyType.String,
+					total: PropertyType.String,
+					totalTax: PropertyType.String,
+					sku: PropertyType.String,
+					price: PropertyType.Integer,
+					parentName: PropertyType.String,
+				},
+			),
+			new KeyChangeTransformation< OrderLineItem >(
+				{
+					productId: 'product_id',
+					variationId: 'variation_id',
+					taxClass: 'tax_class',
+					subtotalTax: 'subtotal_tax',
+					totalTax: 'total_tax',
+				},
+			),
+		],
+	);
+}
+
+/**
+ * Creates a transformer for an order shipping line item object.
+ *
+ * @return {ModelTransformer} The created transformer.
+ */
+function createOrderShippingItemTransformer(): ModelTransformer< OrderShippingLine > {
+	return new ModelTransformer(
+		[
+			new ModelTransformerTransformation( 'taxes', OrderTaxRate, createOrderTaxRateTransformer() ),
+			new PropertyTypeTransformation(
+				{
+					methodTitle: PropertyType.String,
+					methodId: PropertyType.String,
+					total: PropertyType.String,
+					totalTax: PropertyType.String,
+				},
+			),
+			new KeyChangeTransformation< OrderShippingLine >(
+				{
+					methodTitle: 'method_title',
+					methodId: 'method_id',
+					totalTax: 'total_tax',
+				},
+			),
+		],
+	);
+}
diff --git a/tests/e2e/api/src/repositories/rest/shared.ts b/tests/e2e/api/src/repositories/rest/shared.ts
index 1d52d73ec3d..3c4e976d177 100644
--- a/tests/e2e/api/src/repositories/rest/shared.ts
+++ b/tests/e2e/api/src/repositories/rest/shared.ts
@@ -16,6 +16,7 @@ import {
 	CreateChildFn,
 	ModelTransformer,
 	IgnorePropertyTransformation,
+	KeyChangeTransformation,
 	// @ts-ignore
 	ModelParentID,
 } from '../../framework';
@@ -34,6 +35,12 @@ export function createMetaDataTransformer(): ModelTransformer< MetaData > {
 	return new ModelTransformer(
 		[
 			new IgnorePropertyTransformation( [ 'id' ] ),
+			new KeyChangeTransformation< MetaData >(
+				{
+					displayKey: 'display_key',
+					displayValue: 'display_value',
+				},
+			),
 		],
 	);
 }
diff --git a/tests/e2e/config/default.json b/tests/e2e/config/default.json
index 4d6b397aac2..adb8538915e 100644
--- a/tests/e2e/config/default.json
+++ b/tests/e2e/config/default.json
@@ -180,6 +180,17 @@
       }
     }
   },
+  "orders": {
+    "basicPaidOrder": {
+      "paymentMethod": "cod",
+      "status": "processing",
+      "billing": {
+        "firstName": "John",
+        "lastName": "Doe",
+        "email": "john.doe@example.com"
+      }
+    }
+  },
   "onboardingwizard": {
     "industry": "Test industry",
     "numberofproducts": "1 - 10",
diff --git a/tests/e2e/config/jest.setup.js b/tests/e2e/config/jest.setup.js
index 60262d99ea9..b879aca4516 100644
--- a/tests/e2e/config/jest.setup.js
+++ b/tests/e2e/config/jest.setup.js
@@ -1,10 +1,10 @@
-import { SimpleProduct } from '@woocommerce/api';
+import { SimpleProduct, Coupon } from '@woocommerce/api';
 import {
 	visitAdminPage,
 	switchUserToTest,
 	clearLocalStorage,
 	setBrowserViewport,
-	factories,
+	withRestApi,
 } from '@woocommerce/e2e-utils';
 
 const { merchant } = require( '@woocommerce/e2e-utils' );
@@ -38,30 +38,13 @@ async function trashExistingPosts() {
 	await switchUserToTest();
 }
 
-/**
- * Use api package to delete products.
- *
- * @return {Promise} Promise resolving once products have been trashed.
- */
-async function deleteAllProducts() {
-	const repository = SimpleProduct.restRepository( factories.api.withDefaultPermalinks );
-	let products;
-
-	products = await repository.list();
-	while ( products.length > 0 ) {
-		for( let p = 0; p < products.length; p++ ) {
-			await repository.delete( products[ p ].id );
-		}
-		products = await repository.list();
-	}
-}
-
 // Before every test suite run, delete all content created by the test. This ensures
 // other posts/comments/etc. aren't dirtying tests and tests don't depend on
 // each other's side-effects.
 beforeAll( async () => {
 	await trashExistingPosts();
-	await deleteAllProducts();
+	await withRestApi.deleteAllProducts();
+	await withRestApi.deleteAllCoupons();
 	await clearLocalStorage();
 	await setBrowserViewport( 'large' );
 } );
diff --git a/tests/e2e/core-tests/CHANGELOG.md b/tests/e2e/core-tests/CHANGELOG.md
index 098aa07caff..7dc328942d6 100644
--- a/tests/e2e/core-tests/CHANGELOG.md
+++ b/tests/e2e/core-tests/CHANGELOG.md
@@ -1,7 +1,23 @@
 # Unreleased
 
+## Added
+
+- Support for re-running setup and shopper tests
+- Shopper Order Email Receiving
+
+## Fixed
+
+- Checkout create account test would fail if configuration value `addresses.customer.billing.email` was not `john.doe@example.com` 
+
 # 0.1.3
 
+## Added
+
+- Shopper Checkout Login Account
+- Shopper My Account Create Account
+- Shopper Cart Calculate Shipping
+- Shopper Cart Redirection
+
 ## Fixed
 
 - removed use of ES6 `import`
@@ -28,6 +44,7 @@
 - Merchant order emails flow
 - Merchant analytics page load tests
 - Shopper Checkout Create Account
+- Merchant import products via CSV
 
 # 0.1.1
 
diff --git a/tests/e2e/core-tests/README.md b/tests/e2e/core-tests/README.md
index b85cf9d56db..fc3956293a6 100644
--- a/tests/e2e/core-tests/README.md
+++ b/tests/e2e/core-tests/README.md
@@ -30,6 +30,11 @@ runShopperTests();
 
 ```
 
+## Retrying/Re-running tests
+
+On a new site, the setup and activation tests prepare the site for the remainder of the tests. To retry/rerun the test suite on a site where setup/onboarding test have already run use the environment variable `E2E_RETEST=1`.
+
+
 ## Test functions
 
 The functions to access the core tests are:
@@ -63,6 +68,7 @@ The functions to access the core tests are:
   - `runUpdateGeneralSettingsTest` - Merchant can update general settings
   - `runMerchantOrderEmailsTest` - Merchant can receive order emails and resend emails by Order Actions
   - `runAnalyticsPageLoadsTest` - Merchant can load and see all pages in Analytics
+  - `runImportProductsTest` - Merchant can import products via CSV file
 
 ### Shopper
 
@@ -77,6 +83,11 @@ The functions to access the core tests are:
   - `runSingleProductPageTest` - Shopper can view single product page in many variations (simple, variable, grouped)
   - `runVariableProductUpdateTest` - Shopper can view and update variations on a variable product
   - `runCheckoutCreateAccountTest` - Shopper can create an account during checkout
+  - `runCheckoutLoginAccountTest` - Shopper can login to an account during checkout
+  - `runMyAccountCreateAccountTest` - Shopper can create an account via my account page
+  - `runCartCalculateShippingTest` - Shopper can calculate shipping in the cart
+  - `runCartRedirectionTest` - Shopper is redirected to the cart page after adding to cart
+  - `runOrderEmailReceivingTest` - Shopper can receive an email for his order
 
 ### REST API
 
diff --git a/tests/e2e/core-tests/core-tests-root.js b/tests/e2e/core-tests/core-tests-root.js
new file mode 100644
index 00000000000..16a4d4eaa04
--- /dev/null
+++ b/tests/e2e/core-tests/core-tests-root.js
@@ -0,0 +1,26 @@
+/**
+ * External dependencies
+ */
+ const path = require( 'path' );
+
+ const getCoreTestsRoot = () => {
+     // Figure out where we're installed.
+     // Typically will be in node_modules/, but WooCommerce
+     // uses a local file path (tests/e2e/core-tests).
+     let coreTestsPath = false;
+     const moduleDir = path.dirname( require.resolve( '@woocommerce/e2e-core-tests' ) );
+ 
+     if ( -1 < moduleDir.indexOf( 'node_modules' ) ) {
+        coreTestsPath = moduleDir.split( 'node_modules' )[ 0 ];
+     } else if ( -1 < moduleDir.indexOf( 'tests/e2e/core-tests' ) ) {
+        coreTestsPath = moduleDir.split( 'tests/e2e/core-tests' )[ 0 ];
+     }
+ 
+     return {
+      appRoot: coreTestsPath,
+      packageRoot: moduleDir,
+      };
+ };
+ 
+ module.exports = getCoreTestsRoot;
+ 
\ No newline at end of file
diff --git a/tests/e2e/core-tests/package-lock.json b/tests/e2e/core-tests/package-lock.json
new file mode 100644
index 00000000000..a160bfadc3e
--- /dev/null
+++ b/tests/e2e/core-tests/package-lock.json
@@ -0,0 +1,454 @@
+{
+  "name": "@woocommerce/e2e-core-tests",
+  "version": "0.1.3",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "requires": {
+        "@babel/highlight": "^7.12.13"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="
+    },
+    "@babel/highlight": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@jest/environment": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
+      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "requires": {
+        "@jest/fake-timers": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "jest-mock": "^26.5.2"
+      }
+    },
+    "@jest/fake-timers": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
+      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "requires": {
+        "@jest/types": "^26.5.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.5.2",
+        "jest-mock": "^26.5.2",
+        "jest-util": "^26.5.2"
+      }
+    },
+    "@jest/globals": {
+      "version": "26.5.3",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.3.tgz",
+      "integrity": "sha512-7QztI0JC2CuB+Wx1VdnOUNeIGm8+PIaqngYsZXQCkH2QV0GFqzAYc9BZfU0nuqA6cbYrWh5wkuMzyii3P7deug==",
+      "requires": {
+        "@jest/environment": "^26.5.2",
+        "@jest/types": "^26.5.2",
+        "expect": "^26.5.3"
+      }
+    },
+    "@jest/types": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
+      "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      }
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "requires": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/node": {
+      "version": "14.14.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
+      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
+    },
+    "@types/stack-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="
+    },
+    "@types/yargs": {
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "config": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/config/-/config-3.3.3.tgz",
+      "integrity": "sha512-T3RmZQEAji5KYqUQpziWtyGJFli6Khz7h0rpxDwYNjSkr5ynyTWwO7WpfjHzTXclNCDfSWQRcwMb+NwxJesCKw==",
+      "requires": {
+        "json5": "^2.1.1"
+      }
+    },
+    "diff-sequences": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
+      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q=="
+    },
+    "escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+    },
+    "expect": {
+      "version": "26.5.3",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.3.tgz",
+      "integrity": "sha512-kkpOhGRWGOr+TEFUnYAjfGvv35bfP+OlPtqPIJpOCR9DVtv8QV+p8zG0Edqafh80fsjeE+7RBcVUq1xApnYglw==",
+      "requires": {
+        "@jest/types": "^26.5.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.5.2",
+        "jest-message-util": "^26.5.2",
+        "jest-regex-util": "^26.0.0"
+      }
+    },
+    "faker": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+    },
+    "jest-diff": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
+      "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+      "requires": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.5.0",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      }
+    },
+    "jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+    },
+    "jest-matcher-utils": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
+      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "requires": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.5.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.5.2"
+      }
+    },
+    "jest-message-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
+      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.5.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      }
+    },
+    "jest-mock": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
+      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+      "requires": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*"
+      }
+    },
+    "jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="
+    },
+    "jest-util": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
+      "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+      "requires": {
+        "@jest/types": "^26.5.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "picomatch": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="
+    },
+    "pretty-format": {
+      "version": "26.5.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
+      "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+      "requires": {
+        "@jest/types": "^26.5.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+    },
+    "stack-utils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+    }
+  }
+}
diff --git a/tests/e2e/core-tests/package.json b/tests/e2e/core-tests/package.json
index e4fbe124975..06c0628b776 100644
--- a/tests/e2e/core-tests/package.json
+++ b/tests/e2e/core-tests/package.json
@@ -11,7 +11,8 @@
   "main": "index.js",
   "dependencies": {
     "@jest/globals": "^26.4.2",
-    "config": "3.3.3"
+    "config": "3.3.3",
+    "faker": "^5.1.0"
   },
   "peerDependencies": {
     "@woocommerce/api": "^0.1.2",
diff --git a/tests/e2e/core-tests/specs/activate-and-setup/onboarding-tasklist.test.js b/tests/e2e/core-tests/specs/activate-and-setup/onboarding-tasklist.test.js
index 4c31fff7c95..47aeecb715f 100644
--- a/tests/e2e/core-tests/specs/activate-and-setup/onboarding-tasklist.test.js
+++ b/tests/e2e/core-tests/specs/activate-and-setup/onboarding-tasklist.test.js
@@ -1,25 +1,46 @@
 /* eslint-disable jest/no-export, jest/no-disabled-tests */
+
 /**
  * Internal dependencies
  */
 const {
 	merchant,
 	completeOnboardingWizard,
+	withRestApi,
+	addShippingZoneAndMethod,
+	IS_RETEST_MODE,
 } = require( '@woocommerce/e2e-utils' );
 
 /**
  * External dependencies
  */
+const config = require( 'config' );
 const {
 	it,
 	describe,
 } = require( '@jest/globals' );
 
+const shippingZoneNameUS = config.get( 'addresses.customer.shipping.country' );
+
 const runOnboardingFlowTest = () => {
 	describe('Store owner can go through store Onboarding', () => {
+		if ( IS_RETEST_MODE ) {
+			it('can reset onboarding to default settings', async () => {
+				await withRestApi.resetOnboarding();
+			});
+
+			it('can reset shipping zones to default settings', async () => {
+				await withRestApi.deleteAllShippingZones();
+			});
+
+			it('can reset to default settings', async () => {
+				await withRestApi.resetSettingsGroupToDefault('general');
+				await withRestApi.resetSettingsGroupToDefault('products');
+				await withRestApi.resetSettingsGroupToDefault('tax');
+			});
+		}
 
 		it('can start and complete onboarding when visiting the site for the first time.', async () => {
-			await merchant.runSetupWizard();
 			await completeOnboardingWizard();
 		});
 	});
@@ -33,24 +54,25 @@ const runTaskListTest = () => {
 			});
 			// Query for all tasks on the list
 			const taskListItems = await page.$$('.woocommerce-list__item-title');
-			expect(taskListItems).toHaveLength(6);
+			expect(taskListItems.length).toBeInRange( 5, 6 );
 
-			const [ setupTaskListItem ] = await page.$x( '//div[contains(text(),"Set up shipping")]' );
-			await Promise.all([
+			// Work around for https://github.com/woocommerce/woocommerce-admin/issues/6761
+			if ( taskListItems.length == 6 ) {
 				// Click on "Set up shipping" task to move to the next step
-				setupTaskListItem.click(),
+				const [ setupTaskListItem ] = await page.$x( '//div[contains(text(),"Set up shipping")]' );
+				await setupTaskListItem.click();
 
-				// Wait for shipping setup section to load
-				page.waitForNavigation({waitUntil: 'networkidle0'}),
-			]);
+				// Wait for "Proceed" button to become active
+				await page.waitForSelector('button.is-primary:not(:disabled)');
+				await page.waitFor(3000);
 
-			// Wait for "Proceed" button to become active
-			await page.waitForSelector('button.is-primary:not(:disabled)');
-			await page.waitFor(3000);
-
-			// Click on "Proceed" button to save shipping settings
-			await page.click('button.is-primary');
-			await page.waitFor(3000);
+				// Click on "Proceed" button to save shipping settings
+				await page.click('button.is-primary');
+				await page.waitFor(3000);
+			} else {
+				await merchant.openNewShipping();
+				await addShippingZoneAndMethod(shippingZoneNameUS);
+			}
 		});
 	});
 };
diff --git a/tests/e2e/core-tests/specs/activate-and-setup/setup.test.js b/tests/e2e/core-tests/specs/activate-and-setup/setup.test.js
index 1af767c7e03..6ebc3fe961e 100644
--- a/tests/e2e/core-tests/specs/activate-and-setup/setup.test.js
+++ b/tests/e2e/core-tests/specs/activate-and-setup/setup.test.js
@@ -6,7 +6,6 @@ const { HTTPClientFactory } = require( '@woocommerce/api' );
 const {
 	it,
 	describe,
-	beforeAll,
 } = require( '@jest/globals' );
 
 /**
diff --git a/tests/e2e/core-tests/specs/api/order.test.js b/tests/e2e/core-tests/specs/api/order.test.js
new file mode 100644
index 00000000000..cdfc0b7a5c1
--- /dev/null
+++ b/tests/e2e/core-tests/specs/api/order.test.js
@@ -0,0 +1,82 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests */
+/**
+ * Internal dependencies
+ */
+ const { HTTPClientFactory, Order } = require( '@woocommerce/api' );
+
+ /**
+  * External dependencies
+  */
+ const config = require( 'config' );
+ const {
+	 it,
+	 describe,
+	 beforeAll,
+ } = require( '@jest/globals' );
+
+ /**
+ * Creates an order and tests interactions with it via the API.
+ */
+const runOrderApiTest = () => {
+	describe('REST API > Order', () => {
+		let client;
+		let order;
+		let repository;
+
+		beforeAll(async () => {
+			order = config.get( 'orders.basicPaidOrder' );
+			const admin = config.get( 'users.admin' );
+			const url = config.get( 'url' );
+
+			client = HTTPClientFactory.build( url )
+				.withBasicAuth( admin.username, admin.password )
+				.withIndexPermalinks()
+				.create();
+		} );
+
+		it('can create an order', async () => {
+			repository = Order.restRepository( client );
+
+			// Check properties of the order in the create order response.
+			order = await repository.create( order );
+			expect( order ).toEqual( expect.objectContaining( order ) );
+		});
+
+		it('can retrieve an order', async () => {
+			const orderProperties = {
+				id: order.id,
+				payment_method: order.paymentMethod,
+				status: order.status,
+			};
+
+			// Read order directly from API to compare.
+			const response = await client.get( `/wc/v3/orders/${order.id}` );
+			expect( response.statusCode ).toBe( 200 );
+			expect( response.data ).toEqual( expect.objectContaining( orderProperties ) );
+		});
+
+		it('can update an order', async () => {
+			const updatedOrderProperties = {
+				payment_method: 'bacs',
+				status: 'completed',
+			};
+
+			await repository.update( order.id, updatedOrderProperties );
+
+			// Check the order response for the updated values.
+			const response = await client.get( `/wc/v3/orders/${order.id}` );
+			expect( response.statusCode ).toBe( 200 );
+			expect( response.data ).toEqual( expect.objectContaining( updatedOrderProperties ) );
+		});
+
+		it('can delete an order', async () => {
+			// Delete the order
+			const status = await repository.delete( order.id );
+
+			// If the delete is successful, the response comes back truthy
+			expect( status ).toBeTruthy();
+		});
+	});
+};
+
+module.exports = runOrderApiTest;
diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js
index 3f133ba80ae..030605d5bd3 100644
--- a/tests/e2e/core-tests/specs/index.js
+++ b/tests/e2e/core-tests/specs/index.js
@@ -16,12 +16,18 @@ const runCheckoutApplyCouponsTest = require( './shopper/front-end-checkout-coupo
 const runCheckoutPageTest = require( './shopper/front-end-checkout.test' );
 const runMyAccountPageTest = require( './shopper/front-end-my-account.test' );
 const runMyAccountPayOrderTest = require( './shopper/front-end-my-account-pay-order.test' );
+const runMyAccountCreateAccountTest = require( './shopper/front-end-my-account-create-account.test' );
 const runSingleProductPageTest = require( './shopper/front-end-single-product.test' );
 const runVariableProductUpdateTest = require( './shopper/front-end-variable-product-updates.test' );
 const runCheckoutCreateAccountTest = require( './shopper/front-end-checkout-create-account.test' );
+const runCheckoutLoginAccountTest = require( './shopper/front-end-checkout-login-account.test' );
+const runCartCalculateShippingTest = require( './shopper/front-end-cart-calculate-shipping.test' );
+const runCartRedirectionTest = require( './shopper/front-end-cart-redirection.test' );
+const runOrderEmailReceivingTest = require( './shopper/front-end-order-email-receiving.test' );
 
 // Merchant tests
 const runAddNewShippingZoneTest = require ( './merchant/wp-admin-settings-shipping-zones.test' );
+const runAddShippingClassesTest = require('./merchant/wp-admin-settings-shipping-classes.test')
 const runCreateCouponTest = require( './merchant/wp-admin-coupon-new.test' );
 const runCreateOrderTest = require( './merchant/wp-admin-order-new.test' );
 const runEditOrderTest = require( './merchant/wp-admin-order-edit.test' );
@@ -38,12 +44,15 @@ const runMerchantOrdersCustomerPaymentPage = require( './merchant/wp-admin-order
 const runMerchantOrderEmailsTest = require( './merchant/wp-admin-order-emails.test' );
 const runOrderSearchingTest = require( './merchant/wp-admin-order-searching.test' );
 const runAnalyticsPageLoadsTest = require( './merchant/wp-admin-analytics-page-loads.test' );
+const runImportProductsTest = require( './merchant/wp-admin-product-import-csv.test' );
+const runInitiateWccomConnectionTest = require( './merchant/wp-admin-extensions-connect-wccom.test' );
 
 // REST API tests
 const runExternalProductAPITest = require( './api/external-product.test' );
 const runCouponApiTest = require( './api/coupon.test' );
 const runGroupedProductAPITest = require( './api/grouped-product.test' );
 const runVariableProductAPITest = require( './api/variable-product.test' );
+const runOrderApiTest = require( './api/order.test' );
 
 const runSetupOnboardingTests = () => {
 	runActivationTest();
@@ -60,12 +69,19 @@ const runShopperTests = () => {
 	runCheckoutPageTest();
 	runMyAccountPageTest();
 	runMyAccountPayOrderTest();
+	runMyAccountCreateAccountTest();
 	runSingleProductPageTest();
 	runVariableProductUpdateTest();
 	runCheckoutCreateAccountTest();
+	runCheckoutLoginAccountTest();
+	runCartCalculateShippingTest();
+	runCartRedirectionTest();
+	runOrderEmailReceivingTest();
 };
 
 const runMerchantTests = () => {
+	runAddShippingClassesTest();
+	runImportProductsTest();
 	runOrderSearchingTest();
 	runAddNewShippingZoneTest();
 	runCreateCouponTest();
@@ -83,6 +99,7 @@ const runMerchantTests = () => {
 	runProductSearchTest();
 	runMerchantOrdersCustomerPaymentPage();
 	runAnalyticsPageLoadsTest();
+	runInitiateWccomConnectionTest();
 }
 
 const runApiTests = () => {
@@ -90,6 +107,7 @@ const runApiTests = () => {
 	runGroupedProductAPITest();
 	runVariableProductAPITest();
 	runCouponApiTest();
+	runOrderApiTest();
 }
 
 module.exports = {
@@ -119,6 +137,7 @@ module.exports = {
 	runUpdateGeneralSettingsTest,
 	runProductSettingsTest,
 	runTaxSettingsTest,
+	runOrderApiTest,
 	runOrderStatusFiltersTest,
 	runOrderRefundTest,
 	runOrderApplyCouponTest,
@@ -131,6 +150,14 @@ module.exports = {
 	runAddNewShippingZoneTest,
 	runProductBrowseSearchSortTest,
 	runApiTests,
+	runAddShippingClassesTest,
 	runAnalyticsPageLoadsTest,
 	runCheckoutCreateAccountTest,
+	runImportProductsTest,
+	runCheckoutLoginAccountTest,
+	runCartCalculateShippingTest,
+	runCartRedirectionTest,
+	runMyAccountCreateAccountTest,
+	runOrderEmailReceivingTest,
+	runInitiateWccomConnectionTest,
 };
diff --git a/tests/e2e/core-tests/specs/keep/onboarding-tasklist.test.js b/tests/e2e/core-tests/specs/keep/onboarding-tasklist.test.js
new file mode 100644
index 00000000000..47aeecb715f
--- /dev/null
+++ b/tests/e2e/core-tests/specs/keep/onboarding-tasklist.test.js
@@ -0,0 +1,83 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests */
+
+/**
+ * Internal dependencies
+ */
+const {
+	merchant,
+	completeOnboardingWizard,
+	withRestApi,
+	addShippingZoneAndMethod,
+	IS_RETEST_MODE,
+} = require( '@woocommerce/e2e-utils' );
+
+/**
+ * External dependencies
+ */
+const config = require( 'config' );
+const {
+	it,
+	describe,
+} = require( '@jest/globals' );
+
+const shippingZoneNameUS = config.get( 'addresses.customer.shipping.country' );
+
+const runOnboardingFlowTest = () => {
+	describe('Store owner can go through store Onboarding', () => {
+		if ( IS_RETEST_MODE ) {
+			it('can reset onboarding to default settings', async () => {
+				await withRestApi.resetOnboarding();
+			});
+
+			it('can reset shipping zones to default settings', async () => {
+				await withRestApi.deleteAllShippingZones();
+			});
+
+			it('can reset to default settings', async () => {
+				await withRestApi.resetSettingsGroupToDefault('general');
+				await withRestApi.resetSettingsGroupToDefault('products');
+				await withRestApi.resetSettingsGroupToDefault('tax');
+			});
+		}
+
+		it('can start and complete onboarding when visiting the site for the first time.', async () => {
+			await completeOnboardingWizard();
+		});
+	});
+};
+
+const runTaskListTest = () => {
+	describe('Store owner can go through setup Task List', () => {
+		it('can setup shipping', async () => {
+			await page.evaluate(() => {
+				document.querySelector('.woocommerce-list__item-title').scrollIntoView();
+			});
+			// Query for all tasks on the list
+			const taskListItems = await page.$$('.woocommerce-list__item-title');
+			expect(taskListItems.length).toBeInRange( 5, 6 );
+
+			// Work around for https://github.com/woocommerce/woocommerce-admin/issues/6761
+			if ( taskListItems.length == 6 ) {
+				// Click on "Set up shipping" task to move to the next step
+				const [ setupTaskListItem ] = await page.$x( '//div[contains(text(),"Set up shipping")]' );
+				await setupTaskListItem.click();
+
+				// Wait for "Proceed" button to become active
+				await page.waitForSelector('button.is-primary:not(:disabled)');
+				await page.waitFor(3000);
+
+				// Click on "Proceed" button to save shipping settings
+				await page.click('button.is-primary');
+				await page.waitFor(3000);
+			} else {
+				await merchant.openNewShipping();
+				await addShippingZoneAndMethod(shippingZoneNameUS);
+			}
+		});
+	});
+};
+
+module.exports = {
+	runOnboardingFlowTest,
+	runTaskListTest,
+};
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js
new file mode 100644
index 00000000000..c43022d2024
--- /dev/null
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js
@@ -0,0 +1,47 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests */
+/**
+ * Internal dependencies
+ */
+ const {
+	merchant,
+} = require( '@woocommerce/e2e-utils' );
+
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
+const runInitiateWccomConnectionTest = () => {
+	describe('Merchant > Initiate WCCOM Connection', () => {
+		beforeAll(async () => {
+			await merchant.login();
+		});
+
+		it('can initiate WCCOM connection', async () => {
+			await merchant.openExtensions();
+
+			// Click on a tab to choose WooCommerce Subscriptions extension
+			await Promise.all([
+				expect(page).toClick('a.nav-tab', {text: "WooCommerce.com Subscriptions"}),
+				page.waitForNavigation({waitUntil: 'networkidle0'}),
+			]);
+
+			// Click on Connect button to initiate a WCCOM connection
+			await Promise.all([
+				expect(page).toClick('.button-helper-connect'),
+				page.waitForNavigation({waitUntil: 'networkidle0'}),
+			]);
+
+			// Verify that you see a login page for connecting WCCOM account
+			await expect(page).toMatchElement('div.login');
+			await expect(page).toMatchElement('input#usernameOrEmail');
+			await expect(page).toMatchElement('button.button', {text: "Continue"});
+		});
+	});
+}
+
+module.exports = runInitiateWccomConnectionTest;
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-apply-coupon.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-apply-coupon.test.js
index dc29a02a7b7..3aa75b25b57 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-apply-coupon.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-apply-coupon.test.js
@@ -27,11 +27,11 @@ const runOrderApplyCouponTest = () => {
 	describe('WooCommerce Orders > Apply coupon', () => {
 		beforeAll(async () => {
 			await merchant.login();
+			await createSimpleProduct();
+			couponCode = await createCoupon();
+			orderId = await createSimpleOrder('Pending payment', simpleProductName);
 			await Promise.all([
-				await createSimpleProduct(),
-				couponCode = await createCoupon(),
-				orderId = await createSimpleOrder('Pending payment', simpleProductName),
-				await addProductToOrder(orderId, simpleProductName),
+				addProductToOrder(orderId, simpleProductName),
 
 				// We need to remove any listeners on the `dialog` event otherwise we can't catch the dialog below
 				page.removeAllListeners('dialog'),
@@ -42,15 +42,14 @@ const runOrderApplyCouponTest = () => {
 		} );
 
 		it('can apply a coupon', async () => {
+			await page.waitForSelector('button.add-coupon');
 			const couponDialog = await expect(page).toDisplayDialog(async () => {
-				await expect(page).toClick('button.add-coupon');
+				await evalAndClick('button.add-coupon');
 			});
-
 			expect(couponDialog.message()).toMatch(couponDialogMessage);
 
 			// Accept the dialog with the coupon code
 			await couponDialog.accept(couponCode);
-
 			await uiUnblocked();
 
 			// Verify the coupon list is showing
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js
index ad18a8de6d1..3b69ba28beb 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js
@@ -11,7 +11,6 @@ const {
 } = require( '@woocommerce/e2e-utils' );
 
 const config = require( 'config' );
-const simpleProductName = config.get( 'products.simple.name' );
 const customerEmail = config.get( 'addresses.customer.billing.email' );
 const adminEmail = 'admin@woocommercecoree2etestsuite.com';
 const storeName = 'WooCommerce Core E2E Test Suite';
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-new.test.js
index eb99633f0d6..942e5c71c1c 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-new.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-new.test.js
@@ -4,12 +4,186 @@
  */
 const {
 	merchant,
-	verifyPublishAndTrash
-} = require( '@woocommerce/e2e-utils' );
+	verifyPublishAndTrash,
+	uiUnblocked
+} = require('@woocommerce/e2e-utils');
+const config = require('config');
+const {
+	HTTPClientFactory,
+	VariableProduct,
+	GroupedProduct,
+	SimpleProduct,
+	ProductVariation,
+	ExternalProduct
+} = require('@woocommerce/api');
+
+const taxRates = [
+	{
+		name: 'Tax Rate Simple',
+		rate: '10',
+		class: 'tax-class-simple'
+	},
+	{
+		name: 'Tax Rate Variable',
+		rate: '20',
+		class: 'tax-class-variable'
+	},
+	{
+		name: 'Tax Rate External',
+		rate: '30',
+		class: 'tax-class-external'
+	}
+];
+
+const taxTotals = ['$10.00', '$40.00', '$240.00'];
+
+const initProducts = async () => {
+	const apiUrl = config.get('url');
+	const adminUsername = config.get('users.admin.username');
+	const adminPassword = config.get('users.admin.password');
+	const httpClient = HTTPClientFactory.build(apiUrl)
+		.withBasicAuth(adminUsername, adminPassword)
+		.create();
+	const taxClassesPath = '/wc/v3/taxes/classes';
+	const taxClasses = [
+		{
+			name: 'Tax Class Simple',
+			slug: 'tax-class-simple-698962'
+		},
+		{
+			name: 'Tax Class Variable',
+			slug: 'tax-class-variable-790238'
+		},
+		{
+			name: 'Tax Class External',
+			slug: 'tax-class-external-991321'
+		}
+	];
+
+	// Enable taxes in settings
+	const enableTaxes = async () => {
+		const path = '/wc/v3/settings/general/woocommerce_calc_taxes';
+		const data = {
+			value: 'yes'
+		};
+		await httpClient.put(path, data);
+	};
+	await enableTaxes();
+
+	// Initialize tax classes
+	const initTaxClasses = async () => {
+		for (const classToBeAdded of taxClasses) {
+			await httpClient.post(taxClassesPath, classToBeAdded);
+		}
+	};
+	await initTaxClasses();
+
+	// Initialize tax rates
+	const initTaxRates = async () => {
+		const path = '/wc/v3/taxes';
+
+		for (const rateToBeAdded of taxRates) {
+			await httpClient.post(path, rateToBeAdded);
+		}
+	};
+	await initTaxRates();
+
+	// Initialization functions per product type
+	const initSimpleProduct = async () => {
+		const repo = SimpleProduct.restRepository(httpClient);
+		const simpleProduct = {
+			name: 'Simple Product 273722',
+			regularPrice: '100',
+			taxClass: 'Tax Class Simple'
+		};
+		return await repo.create(simpleProduct);
+	};
+	const initVariableProduct = async () => {
+		const variations = [
+			{
+				regularPrice: '200',
+				attributes: [
+					{
+						name: 'Size',
+						option: 'Small'
+					},
+					{
+						name: 'Colour',
+						option: 'Yellow'
+					}
+				],
+				taxClass: 'Tax Class Variable'
+			},
+			{
+				regularPrice: '300',
+				attributes: [
+					{
+						name: 'Size',
+						option: 'Medium'
+					},
+					{
+						name: 'Colour',
+						option: 'Magenta'
+					}
+				],
+				taxClass: 'Tax Class Variable'
+			}
+		];
+		const variableProductData = {
+			name: 'Variable Product 024611',
+			type: 'variable',
+			taxClass: 'Tax Class Variable'
+		};
+
+		const variationRepo = ProductVariation.restRepository(httpClient);
+		const productRepo = VariableProduct.restRepository(httpClient);
+		const variableProduct = await productRepo.create(variableProductData);
+		for (const v of variations) {
+			await variationRepo.create(variableProduct.id, v);
+		}
+
+		return variableProduct;
+	};
+	const initGroupedProduct = async () => {
+		const groupedRepo = GroupedProduct.restRepository(httpClient);
+		const defaultGroupedData = config.get('products.grouped');
+		const groupedProductData = {
+			...defaultGroupedData,
+			name: 'Grouped Product 858012'
+		};
+
+		return await groupedRepo.create(groupedProductData);
+	};
+	const initExternalProduct = async () => {
+		const repo = ExternalProduct.restRepository(httpClient);
+		const defaultProps = config.get('products.external');
+		const props = {
+			...defaultProps,
+			name: 'External product 786794',
+			regularPrice: '800',
+			taxClass: 'Tax Class External'
+		};
+		return await repo.create(props);
+	};
+
+	// Create a product for each product type
+	const simpleProduct = await initSimpleProduct();
+	const variableProduct = await initVariableProduct();
+	const groupedProduct = await initGroupedProduct();
+	const externalProduct = await initExternalProduct();
+
+	return [simpleProduct, variableProduct, groupedProduct, externalProduct];
+};
+
+let products;
 
 const runCreateOrderTest = () => {
 	describe('WooCommerce Orders > Add new order', () => {
 		beforeAll(async () => {
+			// Initialize products for each product type
+			products = await initProducts();
+
+			// Login
 			await merchant.login();
 		});
 
@@ -34,7 +208,75 @@ const runCreateOrderTest = () => {
 				'1 order moved to the Trash.'
 			);
 		});
+
+		it('can create new complex order with multiple product types & tax classes', async () => {
+			// Go to "add order" page
+			await merchant.openNewOrder();
+
+			// Open modal window for adding line items
+			await expect(page).toClick('button.add-line-item');
+			await expect(page).toClick('button.add-order-item');
+			await page.waitForSelector('.wc-backbone-modal-header');
+
+			// Search for each product to add, then verify that they are saved
+			for (const { name } of products) {
+				await expect(page).toClick(
+					'.wc-backbone-modal-content tr:last-child .select2-selection__arrow'
+				);
+				await expect(page).toFill(
+					'#wc-backbone-modal-dialog + .select2-container .select2-search__field',
+					name
+				);
+				const firstResult = await page.waitForSelector(
+					'li[data-selected]'
+				);
+				await firstResult.click();
+				await expect(page).toMatchElement(
+					'.wc-backbone-modal-content tr:nth-last-child(2) .wc-product-search option',
+					name
+				);
+			}
+
+			// Save the line items
+			await expect(page).toClick('.wc-backbone-modal-content #btn-ok');
+			await uiUnblocked();
+
+			// Recalculate taxes
+			await expect(page).toDisplayDialog(async () => {
+				await expect(page).toClick('.calculate-action');
+			});
+			await page.waitForSelector('th.line_tax');
+
+			// Save the order and verify line items
+			await expect(page).toClick('button.save_order');
+			await page.waitForNavigation();
+			for (const { name } of products) {
+				await expect(page).toMatchElement('.wc-order-item-name', {
+					text: name
+				});
+			}
+
+			// Verify that the names of each tax class were shown
+			for (const { name } of taxRates) {
+				await expect(page).toMatchElement('th.line_tax', {
+					text: name
+				});
+				await expect(page).toMatchElement('.wc-order-totals td.label', {
+					text: name
+				});
+			}
+
+			// Verify tax amounts
+			for (const amount of taxTotals) {
+				await expect(page).toMatchElement('td.line_tax', {
+					text: amount
+				});
+				await expect(page).toMatchElement('.wc-order-totals td.total', {
+					text: amount
+				});
+			}
+		});
 	});
-}
+};
 
 module.exports = runCreateOrderTest;
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
index ce392d06303..97c5e14a7b7 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable jest/no-export, jest/no-disabled-tests, */
+/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
 
 /**
  * Internal dependencies
@@ -6,131 +6,173 @@
 const {
 	merchant,
 	clearAndFillInput,
-	selectOptionInSelect2,
 	searchForOrder,
 	createSimpleProduct,
 	addProductToOrder,
 	clickUpdateOrder,
+	factories,
+	selectOptionInSelect2,
 } = require( '@woocommerce/e2e-utils' );
 
+const searchString = 'John Doe';
+const customerBilling = {
+	first_name: 'John',
+	last_name: 'Doe',
+	company: 'Automattic',
+	country: 'US',
+	address_1: 'address1',
+	address_2: 'address2',
+	city: 'San Francisco',
+	state: 'CA',
+	postcode: '94107',
+	phone: '123456789',
+	email: 'john.doe@example.com',
+};
+const customerShipping = {
+	first_name: 'Tim',
+	last_name: 'Clark',
+	company: 'Automattic',
+	country: 'US',
+	address_1: 'Oxford Ave',
+	address_2: 'Linwood Ave',
+	city: 'Buffalo',
+	state: 'NY',
+	postcode: '14201',
+	phone: '123456789',
+	email: 'john.doe@example.com',
+};
+
+/**
+ * Set the billing fields for the customer account for this test suite.
+ *
+ * @returns {Promise<void>}
+ */
+const updateCustomerBilling = async () => {
+	const client = factories.api.withDefaultPermalinks;
+	const customerEndpoint = 'wc/v3/customers/';
+	const customers = await client.get( customerEndpoint, {
+		search: 'Jane',
+		role: 'all',
+	} );
+	if ( ! customers.data | ! customers.data.length ) {
+		return;
+	}
+
+	const customerId = customers.data[0].id;
+	const customerData = {
+		id: customerId,
+		billing: customerBilling,
+		shipping: customerShipping,
+	};
+	await client.put( customerEndpoint + customerId, customerData );
+};
+
 const runOrderSearchingTest = () => {
 	describe('WooCommerce Orders > Search orders', () => {
 		let orderId;
-		beforeAll(async () => {
-			await merchant.login();
+		beforeAll( async () => {
 			await createSimpleProduct('Wanted Product');
+			await updateCustomerBilling();
 
-			await Promise.all([
-				// Create new order for testing
-				await merchant.openNewOrder(),
-				await page.waitForSelector('#order_status'),
-				await page.click('#customer_user'),
-				await page.click('span.select2-search > input.select2-search__field'),
-				await page.type('span.select2-search > input.select2-search__field', 'Customer'),
-				await page.waitFor(2000), // to avoid flakyness
-				await page.keyboard.press('Enter'),
-			]);
-
-			await Promise.all([
-				// Change the shipping data
-				await page.waitFor(1000), // to avoid flakiness
-				await page.waitForSelector('#_shipping_first_name'),
-				await clearAndFillInput('#_shipping_first_name', 'Tim'),
-				await clearAndFillInput('#_shipping_last_name', 'Clark'),
-				await clearAndFillInput('#_shipping_address_1', 'Oxford Ave'),
-				await clearAndFillInput('#_shipping_address_2', 'Linwood Ave'),
-				await clearAndFillInput('#_shipping_city', 'Buffalo'),
-				await clearAndFillInput('#_shipping_postcode', '14201'),
-				await page.keyboard.press('Tab'),
-				await page.keyboard.press('Tab'),
-				await page.keyboard.press('Enter'),
-				await page.select('select[name="_shipping_state"]', 'NY'),
-			]);
+			// Create new order for testing
+			await merchant.login();
+			await merchant.openNewOrder();
+			await page.waitForSelector('#order_status');
+			await page.click('#customer_user');
+			await page.click('span.select2-search > input.select2-search__field');
+			await page.type('span.select2-search > input.select2-search__field', 'Jane Smith');
+			await page.waitFor(2000); // to avoid flakyness
+			await page.keyboard.press('Enter');
 
 			// Get the post id
 			const variablePostId = await page.$('#post_ID');
 			orderId = (await(await variablePostId.getProperty('value')).jsonValue());
 
-			// Save new order
+			// Save new order and add desired product to order
 			await clickUpdateOrder('Order updated.', true);
 			await addProductToOrder(orderId, 'Wanted Product');
+
+			// Open All Orders view
 			await merchant.openAllOrdersView();
 		});
 
 		it('can search for order by order id', async () => {
-			await searchForOrder(orderId, orderId, 'John Doe');
+			await searchForOrder(orderId, orderId, searchString);
 		});
 
 		it('can search for order by billing first name', async () => {
-			await searchForOrder('John', orderId, 'John Doe');
+			await searchForOrder(customerBilling.first_name, orderId, searchString);
 		})
 
 		it('can search for order by billing last name', async () => {
-			await searchForOrder('Doe', orderId, 'John Doe');
+			await searchForOrder(customerBilling.last_name, orderId, searchString);
 		})
 
 		it('can search for order by billing company name', async () => {
-			await searchForOrder('Automattic', orderId, 'John Doe');
+			await searchForOrder(customerBilling.company, orderId, searchString);
 		})
 
 		it('can search for order by billing first address', async () => {
-			await searchForOrder('addr 1', orderId, 'John Doe');
+			await searchForOrder(customerBilling.address_1, orderId, searchString);
 		})
 
 		it('can search for order by billing second address', async () => {
-			await searchForOrder('addr 2', orderId, 'John Doe');
+			await searchForOrder(customerBilling.address_2, orderId, searchString);
 		})
 
 		it('can search for order by billing city name', async () => {
-			await searchForOrder('San Francisco', orderId, 'John Doe');
+			await searchForOrder(customerBilling.city, orderId, searchString);
 		})
 
 		it('can search for order by billing post code', async () => {
-			await searchForOrder('94107', orderId, 'John Doe');
+			await searchForOrder(customerBilling.postcode, orderId, searchString);
 		})
 
 		it('can search for order by billing email', async () => {
-			await searchForOrder('john.doe@example.com', orderId, 'John Doe');
+			await searchForOrder(customerBilling.email, orderId, searchString);
 		})
 
 		it('can search for order by billing phone', async () => {
-			await searchForOrder('123456789', orderId, 'John Doe');
+			await searchForOrder(customerBilling.phone, orderId, searchString);
 		})
 
 		it('can search for order by billing state', async () => {
-			await searchForOrder('CA', orderId, 'John Doe');
+			await searchForOrder(customerBilling.state, orderId, searchString);
 		})
 
 		it('can search for order by shipping first name', async () => {
-			await searchForOrder('Tim', orderId, 'John Doe');
+			await searchForOrder(customerShipping.first_name, orderId, searchString);
 		})
 
 		it('can search for order by shipping last name', async () => {
-			await searchForOrder('Clark', orderId, 'John Doe');
+			await searchForOrder(customerShipping.last_name, orderId, searchString);
 		})
 
 		it('can search for order by shipping first address', async () => {
-			await searchForOrder('Oxford Ave', orderId, 'John Doe');
+			await searchForOrder(customerShipping.address_1, orderId, searchString);
 		})
 
 		it('can search for order by shipping second address', async () => {
-			await searchForOrder('Linwood Ave', orderId, 'John Doe');
+			await searchForOrder(customerShipping.address_2, orderId, searchString);
 		})
 
 		it('can search for order by shipping city name', async () => {
-			await searchForOrder('Buffalo', orderId, 'John Doe');
+			await searchForOrder(customerShipping.city, orderId, searchString);
 		})
 
 		it('can search for order by shipping postcode name', async () => {
-			await searchForOrder('14201', orderId, 'John Doe');
+			await searchForOrder(customerShipping.postcode, orderId, searchString);
 		})
 
-		it('can search for order by shipping state name', async () => {
-			await searchForOrder('NY', orderId, 'John Doe');
+		/**
+		 * shipping state is abbreviated. This test passes if billing and shipping state are the same
+		 */
+		it.skip('can search for order by shipping state name', async () => {
+			await searchForOrder('New York', orderId, searchString);
 		})
 
 		it('can search for order by item name', async () => {
-			await searchForOrder('Wanted Product', orderId, 'John Doe');
+			await searchForOrder('Wanted Product', orderId, searchString);
 		})
 	});
 };
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-status-filters.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-status-filters.test.js
index e97a3a96a54..2870fe20830 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-status-filters.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-status-filters.test.js
@@ -57,7 +57,7 @@ const runOrderStatusFiltersTest = () => {
 			await createSimpleOrder(orderStatus.cancelled.description.text);
 			await createSimpleOrder(orderStatus.refunded.description.text);
 			await createSimpleOrder(orderStatus.failed.description.text);
-		}, 40000);
+		}, 60000);
 
 		afterAll( async () => {
 			// Make sure we're on the all orders view and cleanup the orders we created
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-edit-details.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-edit-details.test.js
index 238fa9ba425..78e4fef92da 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-edit-details.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-edit-details.test.js
@@ -35,7 +35,6 @@ const runProductEditDetailsTest = () => {
 			await expect(page).toFill('#_regular_price', '100.05');
 
 			// Save the changes
-			await expect(page).toClick('#publish');
 			await verifyAndPublish('Product updated.');
 			await uiUnblocked();
 
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-import-csv.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-import-csv.test.js
new file mode 100644
index 00000000000..e3705010a93
--- /dev/null
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-import-csv.test.js
@@ -0,0 +1,132 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests */
+/**
+ * Internal dependencies
+ */
+ const {
+	merchant,
+	setCheckbox,
+	moveAllItemsToTrash
+} = require( '@woocommerce/e2e-utils' );
+const getCoreTestsRoot = require( '../../core-tests-root' );
+
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
+const path = require( 'path' );
+const coreTestsPath = getCoreTestsRoot();
+const filePath = path.resolve( coreTestsPath.appRoot, 'sample-data/sample_products.csv' );
+const filePathOverride = path.resolve( coreTestsPath.packageRoot, 'test-data/sample_products_override.csv' );
+const productNames = ["V-Neck T-Shirt", "Hoodie", "Hoodie with Logo", "T-Shirt", "Beanie",
+	"Belt", "Cap", "Sunglasses", "Hoodie with Pocket", "Hoodie with Zipper", "Long Sleeve Tee", "Polo", "Album",
+	"Single", "T-Shirt with Logo", "Beanie with Logo", "Logo Collection", "WordPress Pennant"];
+const productNamesOverride = ["V-Neck T-Shirt Override", "Hoodie Override", "Hoodie with Logo Override",
+	"T-Shirt Override", "Beanie Override", "Belt Override", "Cap Override", "Sunglasses Override",
+	"Hoodie with Pocket Override", "Hoodie with Zipper Override", "Long Sleeve Tee Override",
+	"Polo Override", "Album Override", "Single Override", "T-Shirt with Logo Override", "Beanie with Logo Override",
+	"Logo Collection Override", "WordPress Pennant Override"];
+const productPricesOverride = ["$111.05", "$118.00", "$145.00", "$120.00", "$118.00", "$118.00", "$13.00", "$12.00",
+	"$115.00", "$120.00", "$125.00", "$145.00", "$145.00", "$135.00", "$190.00", "$118.00", "$116.00",
+	"$165.00", "$155.00", "$120.00", "$118.00", "$118.00", "$145.00", "$142.00", "$145.00", "$115.00", "$120.00"];
+const errorMessage = 'Invalid file type. The importer supports CSV and TXT file formats.';
+
+const runImportProductsTest = () => {
+	describe('Import Products from a CSV file', () => {
+		beforeAll(async () => {
+			await merchant.login();
+			await merchant.openAllProductsView();
+			await merchant.openImportProducts();
+		});
+		it('should show error message if you go without providing CSV file', async () => {
+			// Verify the error message if you go without providing CSV file
+			await Promise.all( [
+				page.click( 'button[value="Continue"]' ),
+				page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+			]);
+			await page.waitForSelector('div.error');
+			await expect(page).toMatchElement('div.error > p', errorMessage);
+		});
+
+		it('can upload the CSV file and import products', async () => {
+			// Put the CSV products file and proceed further
+			const uploader = await page.$("input[type=file]");
+			await uploader.uploadFile(filePath);
+			await expect(page).toClick('button[value="Continue"]');
+
+			// Click on Run the importer
+			await page.waitForSelector('button[value="Run the importer"]');
+			await expect(page).toClick('button[value="Run the importer"]');
+
+			// Waiting for importer to finish
+			await page.waitForSelector('section.woocommerce-importer-done', {visible:true, timeout: 120000});
+			await page.waitForSelector('.woocommerce-importer-done');
+			await expect(page).toMatchElement('.woocommerce-importer-done', {text: 'Import complete!'});
+		});
+
+		it('can see and verify the uploaded products', async () => {
+			// Click on view products
+			await page.waitForSelector('div.wc-actions > a.button.button-primary');
+			await expect(page).toClick('div.wc-actions > a.button.button-primary');
+
+			// Gathering product names
+			await page.waitForSelector('a.row-title');
+			const productTitles = await page.$$eval('a.row-title',
+			elements => elements.map(item => item.innerHTML));
+
+			// Compare imported product names
+			expect(productTitles.sort()).toEqual(productNames.sort());
+		});
+
+		it('can override the existing products via CSV import', async () => {
+			await merchant.openImportProducts();
+
+			// Put the CSV Override products file, set checkbox and proceed further
+			const uploader = await page.$("input[type=file]");
+			await uploader.uploadFile(filePathOverride);
+			await setCheckbox('#woocommerce-importer-update-existing');
+			await expect(page).toClick('button[value="Continue"]');
+
+			// Click on Run the importer
+			await page.waitForSelector('button[value="Run the importer"]');
+			await expect(page).toClick('button[value="Run the importer"]');
+
+			// Waiting for importer to finish
+			await page.waitForSelector('section.woocommerce-importer-done', {visible:true, timeout: 60000});
+			await page.waitForSelector('.woocommerce-importer-done');
+			await expect(page).toMatchElement('.woocommerce-importer-done', {text: 'Import complete!'});
+		});
+
+		it('can see and verify the uploaded overrode products', async () => {
+			// Click on view products
+			await page.waitForSelector('div.wc-actions > a.button.button-primary');
+			await expect(page).toClick('div.wc-actions > a.button.button-primary');
+
+			// Gathering product names
+			await page.waitForSelector('a.row-title');
+			const productTitles = await page.$$eval('a.row-title',
+			 elements => elements.map(item => item.innerHTML));
+
+			// Compare overriden product names
+			expect(productTitles.sort()).toEqual(productNamesOverride.sort());
+
+			// Gathering product prices
+			await page.waitForSelector('td.price.column-price');
+			const productPrices = await page.$$eval('.amount',
+			 elements => elements.map(item => item.innerText));
+
+			// Compare overriden product prices
+			expect(productPrices.sort()).toEqual(productPricesOverride.sort());
+
+			// Move all imported products to trash
+			await moveAllItemsToTrash();
+
+		});
+	});
+};
+
+module.exports = runImportProductsTest;
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js
index 5155fbae0b6..ca72de04f46 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js
@@ -3,11 +3,12 @@
  * Internal dependencies
  */
 const {
+	shopper,
 	merchant,
 	clickTab,
 	uiUnblocked,
 	evalAndClick,
-	setCheckbox,
+	verifyAndPublish,
 } = require( '@woocommerce/e2e-utils' );
 const {
 	waitAndClick,
@@ -24,7 +25,8 @@ const {
 } = require( '@jest/globals' );
 const config = require( 'config' );
 
-const simpleProductName = config.get( 'products.simple.name' );
+const VirtualProductName = 'Virtual Product Name';
+const NonVirtualProductName = 'Non-Virtual Product Name';
 const simpleProductPrice = config.has('products.simple.price') ? config.get('products.simple.price') : '9.99';
 
 const verifyPublishAndTrash = async () => {
@@ -61,35 +63,74 @@ const runAddSimpleProductTest = () => {
 			await merchant.login();
 		});
 
-		it('can create simple virtual product titled "Simple Product" with regular price $9.99', async () => {
+		it('can create simple virtual product and add it to the cart', async () => {
 			await openNewProductAndVerify();
 
-			// Set product data
-			await expect(page).toFill('#title', simpleProductName);
+			// Set product data and publish the product
+			await expect(page).toFill('#title', VirtualProductName);
 			await expect(page).toClick('#_virtual');
 			await clickTab('General');
 			await expect(page).toFill('#_regular_price', simpleProductPrice);
+			await verifyAndPublish();
 
-			// Publish product, verify that it was published. Trash product, verify that it was trashed.
-			await verifyPublishAndTrash(
-				'#publish',
-				'.updated.notice',
-				'Product published.',
-				'Move to Trash',
-				'1 product moved to the Trash.'
-			);
+			await merchant.logout();
+
+			// See product in the shop and add it to the cart
+			await shopper.goToShop();
+			await shopper.addToCartFromShopPage(VirtualProductName);
+			await shopper.goToCart();
+			await shopper.productIsInCart(VirtualProductName);
+
+			// Assert that the page does not contain shipping calculation button
+			await expect(page).not.toMatchElement('a.shipping-calculator-button');
+
+			// Remove product from cart
+			await shopper.removeFromCart(VirtualProductName);
+		});
+
+		it('can create simple non-virtual product and add it to the cart', async () => {
+			await merchant.login();
+			await openNewProductAndVerify();
+
+			// Set product data and publish the product
+			await expect(page).toFill('#title', NonVirtualProductName);
+			await clickTab('General');
+			await expect(page).toFill('#_regular_price', simpleProductPrice);
+			await verifyAndPublish();
+
+			await merchant.logout();
+
+			// See product in the shop and add it to the cart
+			await shopper.goToShop();
+			await shopper.addToCartFromShopPage(NonVirtualProductName);
+			await shopper.goToCart();
+			await shopper.productIsInCart(NonVirtualProductName);
+
+			// Assert that the page does contain shipping calculation button
+			await page.waitForSelector('a.shipping-calculator-button');
+			await expect(page).toMatchElement('a.shipping-calculator-button');
+
+			// Remove product from cart
+			await shopper.removeFromCart(NonVirtualProductName);
 		});
 	});
 };
 
 const runAddVariableProductTest = () => {
 	describe('Add New Variable Product Page', () => {
+		beforeAll(async () => {
+			await merchant.login();
+		});
+
 		it('can create product with variations', async () => {
 			await openNewProductAndVerify();
 
 			// Set product data
 			await expect(page).toFill('#title', 'Variable Product with Three Variations');
 			await expect(page).toSelect('#product-type', 'Variable product');
+		});
+
+		it('can create set variable product attributes', async () => {
 
 			// Create attributes for variations
 			await waitAndClick( page, '.attribute_tab a' );
@@ -111,7 +152,9 @@ const runAddVariableProductTest = () => {
 			// Wait for attribute form to save (triggers 2 UI blocks)
 			await uiUnblocked();
 			await uiUnblocked();
+		});
 
+		it('can create variable product variations', async () => {
 			// Create variations from attributes
 			await waitForSelector( page, '.variations_tab' );
 			await waitAndClick( page, '.variations_tab a' );
@@ -129,8 +172,11 @@ const runAddVariableProductTest = () => {
 			// Set some variation data
 			await uiUnblocked();
 			await uiUnblocked();
+		});
 
+		it('can create variation attributes', async () => {
 			await waitAndClick( page, '.variations_tab a' );
+			await uiUnblocked();
 			await waitForSelector(
 				page,
 				'select[name="attribute_attr-1[0]"]',
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-classes.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-classes.test.js
new file mode 100644
index 00000000000..1d35bfbe679
--- /dev/null
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-classes.test.js
@@ -0,0 +1,73 @@
+/* eslint-disable jest/no-export*/
+
+/**
+ * Internal dependencies
+ */
+const { merchant } = require('@woocommerce/e2e-utils');
+const { lorem, helpers } = require('faker');
+
+const runAddShippingClassesTest = () => {
+	describe('Merchant can add shipping classes', () => {
+		beforeAll(async () => {
+			await merchant.login();
+
+			// Go to Shipping Classes page
+			await merchant.openSettings('shipping', 'classes');
+		});
+
+		it('can add shipping classes', async () => {
+			const shippingClassSlug = {
+				name: lorem.words(),
+				slug: lorem.slug(),
+				description: lorem.sentence()
+			};
+			const shippingClassNoSlug = {
+				name: lorem.words(3),
+				slug: '',
+				description: lorem.sentence()
+			};
+			const shippingClasses = [shippingClassSlug, shippingClassNoSlug];
+
+			// Add shipping classes
+			for (const { name, slug, description } of shippingClasses) {
+				await expect(page).toClick('.wc-shipping-class-add');
+				await expect(page).toFill(
+					'.editing:last-child [data-attribute="name"]',
+					name
+				);
+				await expect(page).toFill(
+					'.editing:last-child [data-attribute="slug"]',
+					slug
+				);
+				await expect(page).toFill(
+					'.editing:last-child [data-attribute="description"]',
+					description
+				);
+			}
+			await expect(page).toClick('.wc-shipping-class-save');
+
+			// Set the expected auto-generated slug
+			shippingClassNoSlug.slug = helpers.slugify(
+				shippingClassNoSlug.name
+			);
+
+			// Verify that the specified shipping classes were saved
+			for (const { name, slug, description } of shippingClasses) {
+				const row = await expect(
+					page
+				).toMatchElement('.wc-shipping-class-rows tr', { text: slug });
+
+				await expect(row).toMatchElement(
+					'.wc-shipping-class-name',
+					name
+				);
+				await expect(row).toMatchElement(
+					'.wc-shipping-class-description',
+					description
+				);
+			}
+		});
+	});
+};
+
+module.exports = runAddShippingClassesTest;
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
index e7da3ffe377..c6bae31d94f 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
@@ -10,10 +10,18 @@ const {
 	addShippingZoneAndMethod,
 	clearAndFillInput,
 	selectOptionInSelect2,
-	evalAndClick,
-	uiUnblocked,
+	deleteAllShippingZones,
 } = require( '@woocommerce/e2e-utils' );
 
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
 const config = require( 'config' );
 const simpleProductPrice = config.has( 'products.simple.price' ) ? config.get( 'products.simple.price' ) : '9.99';
 const simpleProductName = config.get( 'products.simple.name' );
@@ -28,27 +36,7 @@ const runAddNewShippingZoneTest = () => {
 		beforeAll(async () => {
 			await merchant.login();
 			await createSimpleProduct();
-			await merchant.openSettings('shipping');
-
-			// Delete existing shipping zones.
-			try {
-				let zone = await page.$( '.wc-shipping-zone-delete' );
-				if ( zone ) {
-					// WP action links aren't clickable because they are hidden with a left=-9999 style.
-					await page.evaluate(() => {
-						document.querySelector('.wc-shipping-zone-name .row-actions')
-							.style
-							.left = '0';
-					});
-					while ( zone ) {
-						await evalAndClick( '.wc-shipping-zone-delete' );
-						await uiUnblocked();
-						zone = await page.$( '.wc-shipping-zone-delete' );
-					}
-				}
-			} catch (error) {
-				// Prevent an error here causing the test to fail.
-			}
+			await deleteAllShippingZones();
 		});
 
 		it('add shipping zone for San Francisco with free Local pickup', async () => {
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-cart-calculate-shipping.test.js b/tests/e2e/core-tests/specs/shopper/front-end-cart-calculate-shipping.test.js
new file mode 100644
index 00000000000..7bdccb60e00
--- /dev/null
+++ b/tests/e2e/core-tests/specs/shopper/front-end-cart-calculate-shipping.test.js
@@ -0,0 +1,136 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
+
+/**
+ * Internal dependencies
+ */
+const {
+	shopper,
+	merchant,
+	createSimpleProduct,
+	addShippingZoneAndMethod,
+	clearAndFillInput,
+	uiUnblocked,
+	selectOptionInSelect2,
+} = require( '@woocommerce/e2e-utils' );
+
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
+const config = require( 'config' );
+const firstProductPrice = config.has( 'products.simple.price' ) ? config.get( 'products.simple.price' ) : '9.99';
+const secondProductPrice = '4.99';
+const fourProductPrice = firstProductPrice * 4;
+var twoProductsPrice = (+firstProductPrice) + (+secondProductPrice);
+var firstProductPriceWithFlatRate = (+firstProductPrice) + (+5);
+var fourProductPriceWithFlatRate = (+fourProductPrice) + (+5);
+var twoProductsPriceWithFlatRate = (+twoProductsPrice) + (+5);
+const firstProductName = 'First Product';
+const secondProductName = 'Second Product';
+const shippingZoneNameDE = 'Germany Free Shipping';
+const shippingCountryDE = 'country:DE';
+const shippingZoneNameFR = 'France Flat Local';
+const shippingCountryFR = 'country:FR';
+
+const runCartCalculateShippingTest = () => {
+	describe('Cart Calculate Shipping', () => {
+		beforeAll(async () => {
+			await merchant.login();
+			await createSimpleProduct(firstProductName);
+			await createSimpleProduct(secondProductName, secondProductPrice);
+			await merchant.openNewShipping();
+
+			// Add a new shipping zone Germany with Free shipping
+			await addShippingZoneAndMethod(shippingZoneNameDE, shippingCountryDE, ' ', 'free_shipping');
+
+			// Add a new shipping zone for France with Flat rate & Local pickup
+			await addShippingZoneAndMethod(shippingZoneNameFR, shippingCountryFR, ' ', 'flat_rate');
+			await page.waitFor(1000); // to avoid flakiness in headless
+			await page.click('a.wc-shipping-zone-method-settings', {text: 'Flat rate'});
+			await clearAndFillInput('#woocommerce_flat_rate_cost', '5');
+			await page.click('.wc-backbone-modal-main button#btn-ok');
+			// Add additional method Local pickup for the same location
+			await page.waitFor(1000); // to avoid flakiness in headless
+			await page.click('button.wc-shipping-zone-add-method', {text:'Add shipping method'});
+			await page.waitForSelector('.wc-shipping-zone-method-selector');
+			await page.select('select[name="add_method_id"]', 'local_pickup');
+			await page.click('button#btn-ok');
+			await page.waitForSelector('#zone_locations');
+			await merchant.logout();
+			await shopper.emptyCart();
+		});
+
+		it('allows customer to calculate Free Shipping if in Germany', async () => {
+			await shopper.goToShop();
+			await shopper.addToCartFromShopPage(firstProductName);
+			await shopper.goToCart();
+
+			// Set shipping country to Germany
+			await expect(page).toClick('a.shipping-calculator-button');
+			await expect(page).toClick('#select2-calc_shipping_country-container');
+			await selectOptionInSelect2('Germany');
+			await expect(page).toClick('button[name="calc_shipping"]');
+
+			// Verify shipping costs
+			await page.waitForSelector('.order-total');
+			await expect(page).toMatchElement('.shipping ul#shipping_method > li', {text: 'Free shipping'});
+			await expect(page).toMatchElement('.order-total .amount', {text: `$${firstProductPrice}`});
+		});
+
+		it('allows customer to calculate Flat rate and Local pickup if in France', async () => {
+			await page.reload();
+
+			// Set shipping country to France
+			await expect(page).toClick('a.shipping-calculator-button');
+			await expect(page).toClick('#select2-calc_shipping_country-container');
+			await selectOptionInSelect2('France');
+			await expect(page).toClick('button[name="calc_shipping"]');
+
+			// Verify shipping costs
+			await page.waitForSelector('.order-total');
+			await expect(page).toMatchElement('.shipping .amount', {text: '$5.00'});
+			await expect(page).toMatchElement('.order-total .amount', {text: `$${firstProductPriceWithFlatRate}`});
+		});
+
+		it('should show correct total cart price after updating quantity', async () => {
+			await shopper.setCartQuantity(firstProductName, 4);
+			await expect(page).toClick('button', {text: 'Update cart'});
+			await uiUnblocked();
+			await expect(page).toMatchElement('.order-total .amount', {text: `$${fourProductPriceWithFlatRate}`});
+		});
+
+		it('should show correct total cart price with 2 products and flat rate', async () => {
+			await shopper.goToShop();
+			await shopper.addToCartFromShopPage(secondProductName);
+			await shopper.goToCart();
+
+			await shopper.setCartQuantity(firstProductName, 1);
+			await expect(page).toClick('button', {text: 'Update cart'});
+			await uiUnblocked();
+			await page.waitForSelector('.order-total');
+			await expect(page).toMatchElement('.shipping .amount', {text: '$5.00'});
+			await expect(page).toMatchElement('.order-total .amount', {text: `$${twoProductsPriceWithFlatRate}`});
+		});
+
+		it('should show correct total cart price with 2 products without flat rate', async () => {
+			await page.reload();
+
+			// Set shipping country to Spain
+			await expect(page).toClick('a.shipping-calculator-button');
+			await expect(page).toClick('#select2-calc_shipping_country-container');
+			await selectOptionInSelect2('Spain');
+			await expect(page).toClick('button[name="calc_shipping"]');
+
+			// Verify shipping costs
+			await page.waitForSelector('.order-total');
+			await expect(page).toMatchElement('.order-total .amount', {text: `$${twoProductsPrice}`});
+		});
+	});
+};
+
+module.exports = runCartCalculateShippingTest;
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-cart-coupons.test.js b/tests/e2e/core-tests/specs/shopper/front-end-cart-coupons.test.js
index b2b3f4888a3..b9a285811d1 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-cart-coupons.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-cart-coupons.test.js
@@ -28,19 +28,18 @@ const runCartApplyCouponsTest = () => {
 		let couponFixedProduct;
 
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
 			couponFixedCart = await createCoupon();
 			couponPercentage = await createCoupon('50', 'Percentage discount');
 			couponFixedProduct = await createCoupon('5', 'Fixed product discount');
-			await merchant.logout();
+			await shopper.emptyCart();
 			await shopper.goToShop();
 			await shopper.addToCartFromShopPage('Simple product');
 			await uiUnblocked();
 			await shopper.goToCart();
 		});
 
-		it('allows customer to apply fixed cart coupon', async () => {
+		it('allows cart to apply fixed cart coupon', async () => {
 			await applyCoupon(couponFixedCart);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -51,7 +50,7 @@ const runCartApplyCouponsTest = () => {
 			await removeCoupon(couponFixedCart);
 		});
 
-		it('allows customer to apply percentage coupon', async () => {
+		it('allows cart to apply percentage coupon', async () => {
 			await applyCoupon(couponPercentage);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -62,7 +61,7 @@ const runCartApplyCouponsTest = () => {
 			await removeCoupon(couponPercentage);
 		});
 
-		it('allows customer to apply fixed product coupon', async () => {
+		it('allows cart to apply fixed product coupon', async () => {
 			await applyCoupon(couponFixedProduct);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -73,7 +72,7 @@ const runCartApplyCouponsTest = () => {
 			await removeCoupon(couponFixedProduct);
 		});
 
-		it('prevents customer applying same coupon twice', async () => {
+		it('prevents cart applying same coupon twice', async () => {
 			await applyCoupon(couponFixedCart);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 			await applyCoupon(couponFixedCart);
@@ -83,7 +82,7 @@ const runCartApplyCouponsTest = () => {
 			await expect(page).toMatchElement('.order-total .amount', {text: '$4.99'});
 		});
 
-		it('allows customer to apply multiple coupons', async () => {
+		it('allows cart to apply multiple coupons', async () => {
 			await applyCoupon(couponFixedProduct);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-cart-redirection.test.js b/tests/e2e/core-tests/specs/shopper/front-end-cart-redirection.test.js
new file mode 100644
index 00000000000..6f24c50f5ed
--- /dev/null
+++ b/tests/e2e/core-tests/specs/shopper/front-end-cart-redirection.test.js
@@ -0,0 +1,76 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
+/**
+ * Internal dependencies
+ */
+ const {
+	shopper,
+	merchant,
+	createSimpleProduct,
+	setCheckbox,
+	unsetCheckbox,
+	settingsPageSaveChanges,
+} = require( '@woocommerce/e2e-utils' );
+
+/**
+ * External dependencies
+ */
+ const {
+	it,
+	describe,
+	beforeAll,
+	afterAll,
+} = require( '@jest/globals' );
+
+const config = require( 'config' );
+const simpleProductName = config.get( 'products.simple.name' );
+
+const runCartRedirectionTest = () => {
+	describe('Cart > Redirect to cart from shop', () => {
+		let simplePostIdValue;
+		beforeAll(async () => {
+			await merchant.login();
+			simplePostIdValue = await createSimpleProduct();
+
+			// Set checkbox in settings to enable cart redirection
+			await merchant.openSettings('products');
+			await setCheckbox('#woocommerce_cart_redirect_after_add');
+			await settingsPageSaveChanges();
+
+			await merchant.logout();
+		});
+
+		it('can redirect user to cart from shop page', async () => {
+			await shopper.goToShop();
+
+			// Add to cart from shop page
+			const addToCartXPath = `//li[contains(@class, "type-product") and a/h2[contains(text(), "${ simpleProductName }")]]` +
+			'//a[contains(@class, "add_to_cart_button") and contains(@class, "ajax_add_to_cart")';
+			const [ addToCartButton ] = await page.$x( addToCartXPath + ']' );
+			addToCartButton.click();
+			await page.waitFor(1000); // to avoid flakiness
+
+			await shopper.productIsInCart(simpleProductName);
+			await shopper.removeFromCart(simpleProductName);
+		});
+
+		it('can redirect user to cart from detail page', async () => {
+			await shopper.goToProduct(simplePostIdValue);
+
+			// Add to cart from detail page
+			await shopper.addToCart();
+			await page.waitFor(1000); // to avoid flakiness
+
+			await shopper.productIsInCart(simpleProductName);
+			await shopper.removeFromCart(simpleProductName);
+		});
+
+		afterAll(async () => {
+			await merchant.login();
+			await merchant.openSettings('products');
+			await unsetCheckbox('#woocommerce_cart_redirect_after_add');
+			await settingsPageSaveChanges();
+		});
+	});
+};
+
+module.exports = runCartRedirectionTest;
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js b/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js
index 2497d0a40f7..c9b221fc3cd 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-cart.test.js
@@ -36,7 +36,7 @@ const runCartPageTest = () => {
 			await expect(page).toMatchElement('.cart-empty', {text: 'Your cart is currently empty.'});
 		});
 
-		it('should add the product to the cart when "Add to cart" is clicked', async () => {
+		it('should add the product to the cart from the shop page', async () => {
 			await shopper.goToShop();
 			await shopper.addToCartFromShopPage(simpleProductName);
 
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-checkout-coupons.test.js b/tests/e2e/core-tests/specs/shopper/front-end-checkout-coupons.test.js
index 34135e5ada0..a14ce2279e0 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-checkout-coupons.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-checkout-coupons.test.js
@@ -28,19 +28,18 @@ const runCheckoutApplyCouponsTest = () => {
 		let couponFixedProduct;
 
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
 			couponFixedCart = await createCoupon();
 			couponPercentage = await createCoupon('50', 'Percentage discount');
 			couponFixedProduct = await createCoupon('5', 'Fixed product discount');
-			await merchant.logout();
+			await shopper.emptyCart();
 			await shopper.goToShop();
 			await shopper.addToCartFromShopPage('Simple product');
 			await uiUnblocked();
 			await shopper.goToCheckout();
 		});
 
-		it('allows customer to apply fixed cart coupon', async () => {
+		it('allows checkout to apply fixed cart coupon', async () => {
 			await applyCoupon(couponFixedCart);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -53,7 +52,7 @@ const runCheckoutApplyCouponsTest = () => {
 			await removeCoupon(couponFixedCart);
 		});
 
-		it('allows customer to apply percentage coupon', async () => {
+		it('allows checkout to apply percentage coupon', async () => {
 			await applyCoupon(couponPercentage);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -63,7 +62,7 @@ const runCheckoutApplyCouponsTest = () => {
 			await removeCoupon(couponPercentage);
 		});
 
-		it('allows customer to apply fixed product coupon', async () => {
+		it('allows checkout to apply fixed product coupon', async () => {
 			await applyCoupon(couponFixedProduct);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -74,7 +73,7 @@ const runCheckoutApplyCouponsTest = () => {
 			await removeCoupon(couponFixedProduct);
 		});
 
-		it('prevents customer applying same coupon twice', async () => {
+		it('prevents checkout applying same coupon twice', async () => {
 			await applyCoupon(couponFixedCart);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 			await applyCoupon(couponFixedCart);
@@ -84,7 +83,7 @@ const runCheckoutApplyCouponsTest = () => {
 			await expect(page).toMatchElement('.order-total .amount', {text: '$4.99'});
 		});
 
-		it('allows customer to apply multiple coupons', async () => {
+		it('allows checkout to apply multiple coupons', async () => {
 			await applyCoupon(couponFixedProduct);
 			await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon code applied successfully.'});
 
@@ -93,7 +92,7 @@ const runCheckoutApplyCouponsTest = () => {
 			await expect(page).toMatchElement('.order-total .amount', {text: '$0.00'});
 		});
 
-		it('restores cart total when coupons are removed', async () => {
+		it('restores checkout total when coupons are removed', async () => {
 			await removeCoupon(couponFixedCart);
 			await removeCoupon(couponFixedProduct);
 			await expect(page).toMatchElement('.order-total .amount', {text: '$9.99'});
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-checkout-create-account.test.js b/tests/e2e/core-tests/specs/shopper/front-end-checkout-create-account.test.js
index 4ccaab02e06..9621ac2f1f3 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-checkout-create-account.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-checkout-create-account.test.js
@@ -9,6 +9,8 @@
 	uiUnblocked,
 	setCheckbox,
 	settingsPageSaveChanges,
+	addShippingZoneAndMethod,
+	withRestApi,
 } = require( '@woocommerce/e2e-utils' );
 
 /**
@@ -22,16 +24,26 @@ const {
 
 const config = require( 'config' );
 const simpleProductName = config.get( 'products.simple.name' );
+const customerBilling = config.get( 'addresses.customer.billing' );
 
 const runCheckoutCreateAccountTest = () => {
 	describe('Shopper Checkout Create Account', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
+			await withRestApi.deleteCustomerByEmail( customerBilling.email );
+
+			// Set checkbox for creating an account during checkout
+			await merchant.login();
 			await merchant.openSettings('account');
 			await setCheckbox('#woocommerce_enable_signup_and_login_from_checkout');
 			await settingsPageSaveChanges();
+
+			// Set free shipping within California
+			await addShippingZoneAndMethod('Free Shipping CA', 'state:US:CA', ' ', 'free_shipping');
+
 			await merchant.logout();
+
+			// Add simple product to cart and proceed to checkout
 			await shopper.goToShop();
 			await shopper.addToCartFromShopPage(simpleProductName);
 			await uiUnblocked();
@@ -40,7 +52,7 @@ const runCheckoutCreateAccountTest = () => {
 
 		it('can create an account during checkout', async () => {
 			// Fill all the details for a new customer
-			await shopper.fillBillingDetails(config.get('addresses.customer.billing'));
+			await shopper.fillBillingDetails( customerBilling );
 			await uiUnblocked();
 
 			// Set checkbox for creating account during checkout
@@ -54,7 +66,7 @@ const runCheckoutCreateAccountTest = () => {
 		it('can verify that the customer has been created', async () => {
 			await merchant.login();
 			await merchant.openAllUsersView();
-			await expect(page).toMatchElement('td.email.column-email > a', {text: 'john.doe@example.com'});
+			await expect(page).toMatchElement('td.email.column-email > a', { text: customerBilling.email });
 		});
 	});
 };
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-checkout-login-account.test.js b/tests/e2e/core-tests/specs/shopper/front-end-checkout-login-account.test.js
new file mode 100644
index 00000000000..db400d5e79d
--- /dev/null
+++ b/tests/e2e/core-tests/specs/shopper/front-end-checkout-login-account.test.js
@@ -0,0 +1,74 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
+/**
+ * Internal dependencies
+ */
+ const {
+	shopper,
+	merchant,
+	createSimpleProduct,
+	uiUnblocked,
+	setCheckbox,
+	settingsPageSaveChanges,
+} = require( '@woocommerce/e2e-utils' );
+
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
+const config = require('config');
+const simpleProductName = config.get('products.simple.name');
+
+const runCheckoutLoginAccountTest = () => {
+	describe('Shopper Checkout Login Account', () => {
+		beforeAll(async () => {
+			await merchant.login();
+			await createSimpleProduct();
+
+			// Set checkbox for logging to account during checkout
+			await merchant.openSettings('account');
+			await setCheckbox('#woocommerce_enable_checkout_login_reminder');
+			await settingsPageSaveChanges();
+			await merchant.logout();
+
+			// Add simple product to cart and proceed to checkout
+			await shopper.goToShop();
+			await shopper.addToCartFromShopPage(simpleProductName);
+			await uiUnblocked();
+			await shopper.goToCheckout();
+		});
+
+		it('can login to an existing account during checkout', async () => {
+			// Click to login during checkout
+			await page.waitForSelector('.woocommerce-form-login-toggle');
+			await expect(page).toClick('.woocommerce-info > a.showlogin');
+
+			// Fill shopper's login credentials and proceed further
+			await page.type( '#username', config.get('users.customer.username') );
+			await page.type( '#password', config.get('users.customer.password') );
+
+			await Promise.all([
+				page.waitForNavigation({waitUntil: 'networkidle0'}),
+				page.click('button[name="login"]'),
+			]);
+
+			// Place an order
+			await shopper.placeOrder();
+			await expect(page).toMatchElement('h1.entry-title', {text: 'Order received'});
+
+			// Verify the email of a logged in user
+			await expect(page).toMatchElement('ul > li.email', {text: 'Email: john.doe@example.com'});
+
+			// Verify the user is logged in on my account page
+			await shopper.gotoMyAccount();
+			await expect(page.url()).toMatch('my-account/');
+			await expect(page).toMatchElement('h1', {text: 'My account'});
+		});
+	});
+};
+
+module.exports = runCheckoutLoginAccountTest;
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-checkout.test.js b/tests/e2e/core-tests/specs/shopper/front-end-checkout.test.js
index 17e84c339c7..8512b52282b 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-checkout.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-checkout.test.js
@@ -9,7 +9,8 @@ const {
 	setCheckbox,
 	settingsPageSaveChanges,
 	uiUnblocked,
-	verifyCheckboxIsSet
+	verifyCheckboxIsSet,
+	addShippingZoneAndMethod,
 } = require( '@woocommerce/e2e-utils' );
 
 const config = require( 'config' );
@@ -29,6 +30,8 @@ const runCheckoutPageTest = () => {
 			await merchant.login();
 			await createSimpleProduct();
 
+			// Set free shipping within California
+			await addShippingZoneAndMethod('Free Shipping CA', 'state:US:CA', ' ', 'free_shipping');
 			// Go to general settings page
 			await merchant.openSettings('general');
 
@@ -137,7 +140,7 @@ const runCheckoutPageTest = () => {
 			// Get order ID from the order received html element on the page
 			let orderReceivedHtmlElement = await page.$('.woocommerce-order-overview__order.order');
 			let orderReceivedText = await page.evaluate(element => element.textContent, orderReceivedHtmlElement);
-			return guestOrderId = orderReceivedText.split(/(\s+)/)[6].toString();
+			guestOrderId = orderReceivedText.split(/(\s+)/)[6].toString();
 		});
 
 		it('allows existing customer to place order', async () => {
@@ -160,7 +163,7 @@ const runCheckoutPageTest = () => {
 			// Get order ID from the order received html element on the page
 			let orderReceivedHtmlElement = await page.$('.woocommerce-order-overview__order.order');
 			let orderReceivedText = await page.evaluate(element => element.textContent, orderReceivedHtmlElement);
-			return customerOrderId = orderReceivedText.split(/(\s+)/)[6].toString();
+			customerOrderId = orderReceivedText.split(/(\s+)/)[6].toString();
 		});
 
 		it('store owner can confirm the order was received', async () => {
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-my-account-create-account.test.js b/tests/e2e/core-tests/specs/shopper/front-end-my-account-create-account.test.js
new file mode 100644
index 00000000000..c467ad029d4
--- /dev/null
+++ b/tests/e2e/core-tests/specs/shopper/front-end-my-account-create-account.test.js
@@ -0,0 +1,45 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests */
+/**
+ * Internal dependencies
+ */
+const {
+	shopper,
+	merchant,
+	setCheckbox,
+	settingsPageSaveChanges,
+	withRestApi,
+} = require( '@woocommerce/e2e-utils' );
+
+const customerEmailAddress = 'john.doe.test@example.com';
+
+const runMyAccountCreateAccountTest = () => {
+	describe('Shopper My Account Create Account', () => {
+		beforeAll(async () => {
+			await withRestApi.deleteCustomerByEmail( customerEmailAddress );
+			await merchant.login();
+
+			// Set checkbox in the settings to enable registration in my account
+			await merchant.openSettings('account');
+			await setCheckbox('#woocommerce_enable_myaccount_registration');
+			await settingsPageSaveChanges();
+
+			await merchant.logout();
+		});
+
+		it('can create a new account via my account', async () => {
+			await shopper.gotoMyAccount();
+			await page.waitForSelector('.woocommerce-form-register');
+			await expect(page).toFill('input#reg_email', customerEmailAddress);
+			await expect(page).toClick('button[name="register"]');
+			await page.waitForNavigation({waitUntil: 'networkidle0'});
+			await expect(page).toMatchElement('h1', 'My account');
+
+			// Verify user has been created successfully
+			await merchant.login();
+			await merchant.openAllUsersView();
+			await expect(page).toMatchElement('td.email.column-email > a', {text: customerEmailAddress});
+		});
+	});
+};
+
+module.exports = runMyAccountCreateAccountTest;
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-order-email-receiving.test.js b/tests/e2e/core-tests/specs/shopper/front-end-order-email-receiving.test.js
new file mode 100644
index 00000000000..da466cae6de
--- /dev/null
+++ b/tests/e2e/core-tests/specs/shopper/front-end-order-email-receiving.test.js
@@ -0,0 +1,59 @@
+/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/expect-expect */
+/**
+ * Internal dependencies
+ */
+ const {
+	shopper,
+	merchant,
+	createSimpleProduct,
+	uiUnblocked,
+	deleteAllEmailLogs,
+} = require( '@woocommerce/e2e-utils' );
+
+let simplePostIdValue;
+let orderId;
+const config = require( 'config' );
+const simpleProductName = config.get( 'products.simple.name' );
+const customerEmail = config.get( 'addresses.customer.billing.email' );
+const storeName = 'WooCommerce Core E2E Test Suite';
+
+/**
+ * External dependencies
+ */
+const {
+	it,
+	describe,
+	beforeAll,
+} = require( '@jest/globals' );
+
+const runOrderEmailReceivingTest = () => {
+	describe('Shopper Order Email Receiving', () => {
+		beforeAll(async () => {
+			await merchant.login();
+			await deleteAllEmailLogs();
+			simplePostIdValue = await createSimpleProduct();
+			await merchant.logout();
+		});
+
+		it('should receive order email after purchasing an item', async () => {
+			await shopper.login();
+
+			// Go to the shop and purchase an item
+			await shopper.goToProduct(simplePostIdValue);
+			await shopper.addToCart(simpleProductName);
+			await shopper.goToCheckout();
+			await uiUnblocked();
+			await shopper.placeOrder();
+			// Get order ID from the order received html element on the page
+			orderId = await page.$$eval(".woocommerce-order-overview__order strong", elements => elements.map(item => item.textContent));
+
+			// Verify the new order email has been received
+			await merchant.login();
+			await merchant.openEmailLog();
+			await expect( page ).toMatchElement( '.column-receiver', { text: customerEmail } );
+			await expect( page ).toMatchElement( '.column-subject', { text: `[${storeName}]: New order #${orderId}` } );
+		});
+	});
+};
+
+module.exports = runOrderEmailReceivingTest;
diff --git a/tests/e2e/core-tests/test-data/sample_products_override.csv b/tests/e2e/core-tests/test-data/sample_products_override.csv
new file mode 100644
index 00000000000..6b880308a7a
--- /dev/null
+++ b/tests/e2e/core-tests/test-data/sample_products_override.csv
@@ -0,0 +1,26 @@
+ID,Type,SKU,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
+,variable,woo-vneck-tee,V-Neck T-Shirt Override,1,"1","visible","This is a variable product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".5","24","1","2","1",,,,Clothing > Tshirts,,,"https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vneck-tee-2.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-green-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-blue-1.jpg",,,,,,,,,0,"Color","Blue, Green, Red","1","1","Size","Large, Medium, Small","1","1","1",,,,
+,variable,woo-hoodie,Hoodie Override,1,"0","visible","This is a variable product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","1.5","10","8","3","1",,,,Clothing > Hoodies,,,"https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-2.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-blue-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-green-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg",,,,,,,,,0,"Color","Blue, Green, Red","1","1","Logo","Yes, No","1","0","1",,,,
+,simple,woo-hoodie-with-logo,Hoodie with Logo Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","2","10","6","3","1",,,"145",Clothing > Hoodies,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg,,,,,,,,,0,"Color","Blue","1","1",,,,,"1",,,,
+,simple,woo-tshirt,T-Shirt Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".8","8","6","1","1",,,"118",Clothing > Tshirts,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/tshirt-2.jpg,,,,,,,,,0,"Color","Gray","1","1",,,,,"1",,,,
+,simple,woo-beanie,Beanie Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".2","4","5",".5","1",,"118","120",Clothing > Accessories,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/beanie-2.jpg,,,,,,,,,0,"Color","Red","1","1",,,,,"1",,,,
+,simple,woo-belt,Belt Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","1.2","12","2","1.5","1",,"155","165",Clothing > Accessories,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/belt-2.jpg,,,,,,,,,0,,,,,,,,,"1",,,,
+,simple,woo-cap,Cap Override,1,"1","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","0.6","8","6.5","4","1",,"116","118",Clothing > Accessories,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/cap-2.jpg,,,,,,,,,0,"Color","Yellow","1","1",,,,,"1",,,,
+,simple,woo-sunglasses,Sunglasses Override,1,"1","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".2","4","1.4","1","1",,,"190",Clothing > Accessories,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/sunglasses-2.jpg,,,,,,,,,0,,,,,,,,,"1",,,,
+,simple,woo-hoodie-with-pocket,Hoodie with Pocket Override,1,"1","hidden","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","3","10","8","2","1",,"135","145",Clothing > Hoodies,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-pocket-2.jpg,,,,,,,,,0,"Color","Gray","1","1",,,,,"1",,,,
+,simple,woo-hoodie-with-zipper,Hoodie with Zipper Override,1,"1","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","2","8","6","2","1",,,"145",Clothing > Hoodies,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-zipper-2.jpg,,,,,,,,,0,,,,,,,,,"1",,,,
+,simple,woo-long-sleeve-tee,Long Sleeve Tee Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0","1","7","5","1","1",,,"125",Clothing > Tshirts,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/long-sleeve-tee-2.jpg,,,,,,,,,0,"Color","Green","1","1",,,,,"1",,,,
+,simple,woo-polo,Polo Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".8","6","5","1","1",,,"120",Clothing > Tshirts,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/polo-2.jpg,,,,,,,,,0,"Color","Blue","1","1",,,,,"1",,,,
+,"simple, downloadable, virtual",woo-album,Album Override,1,"0","visible","This is a simple, virtual product.","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"1",,,"115",Music,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/album-1.jpg,"1","1",,,,,,,0,,,,,,,,,"1","Single 1","https://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2017/08/single.jpg","Single 2","https://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2017/08/album.jpg"
+,"simple, downloadable, virtual",woo-single,Single Override,1,"0","visible","This is a simple, virtual product.","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"1",,"12","13",Music,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/single-1.jpg,"1","1",,,,,,,0,,,,,,,,,"1","Single","https://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2017/08/single.jpg",,
+,variation,woo-vneck-tee-red,V-Neck T-Shirt - Red Override,1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"120",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vneck-tee-2.jpg,,,woo-vneck-tee,,,,,,0,"Color","Red",,"1","Size",,,"1",,,,,
+,variation,woo-vneck-tee-green,V-Neck T-Shirt - Green Override,1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"120",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-green-1.jpg,,,woo-vneck-tee,,,,,,0,"Color","Green",,"1","Size",,,"1",,,,,
+,variation,woo-vneck-tee-blue,V-Neck T-Shirt - Blue Override,1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"115",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-blue-1.jpg,,,woo-vneck-tee,,,,,,0,"Color","Blue",,"1","Size",,,"1",,,,,
+,variation,woo-hoodie-red,"Hoodie - Red, No Override",1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,"142","145",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-2.jpg,,,woo-hoodie,,,,,,1,"Color","Red",,"1","Logo","No",,"0",,,,,
+,variation,woo-hoodie-green,"Hoodie - Green, No Override",1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"145",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-green-1.jpg,,,woo-hoodie,,,,,,2,"Color","Green",,"1","Logo","No",,"0",,,,,
+,variation,woo-hoodie-blue,"Hoodie - Blue, No Override",1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"145",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-blue-1.jpg,,,woo-hoodie,,,,,,3,"Color","Blue",,"1","Logo","No",,"0",,,,,
+,simple,Woo-tshirt-logo,T-Shirt with Logo Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".5","10","12",".5","1",,,"118",Clothing > Tshirts,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/t-shirt-with-logo-1.jpg,,,,,,,,,0,"Color","Gray","1","1",,,,,"1",,,,
+,simple,Woo-beanie-logo,Beanie with Logo Override,1,"0","visible","This is a simple product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",".2","6","4","1","1",,"118","120",Clothing > Accessories,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/beanie-with-logo-1.jpg,,,,,,,,,0,"Color","Red","1","1",,,,,"1",,,,
+,grouped,logo-collection,Logo Collection Override,1,"0","visible","This is a grouped product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",,,,,"1",,,,Clothing,,,"https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/beanie-with-logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/t-shirt-with-logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg",,,,"woo-hoodie-with-logo, woo-tshirt, woo-beanie",,,,,0,,,,,,,,,"1",,,,
+,external,wp-pennant,WordPress Pennant Override,1,"0","visible","This is an external product.","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.",,,"taxable",,"1",,"0","0",,,,,"1",,,"111.05",Decor,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/pennant-1.jpg,,,,,,,"https://mercantile.wordpress.org/product/wordpress-pennant/","Buy on the WordPress swag store!",0,,,,,,,,,"1",,,,
+,variation,woo-hoodie-blue-logo,"Hoodie - Blue, Yes Override",1,"0","visible",,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.",,,"taxable",,"1",,"0","0",,,,,"0",,,"145",,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg,,,woo-hoodie,,,,,,0,"Color","Blue",,"1","Logo","Yes",,"0",,,,,
\ No newline at end of file
diff --git a/tests/e2e/docker/initialize.sh b/tests/e2e/docker/initialize.sh
index 0a9592f5379..972bc2877a9 100755
--- a/tests/e2e/docker/initialize.sh
+++ b/tests/e2e/docker/initialize.sh
@@ -4,7 +4,12 @@ echo "Initializing WooCommerce E2E"
 
 wp plugin activate woocommerce
 wp theme install twentynineteen --activate
-wp user create customer customer@woocommercecoree2etestsuite.com --user_pass=password --role=subscriber --path=/var/www/html
+wp user create customer customer@woocommercecoree2etestsuite.com \
+	--user_pass=password \
+	--role=subscriber \
+	--first_name='Jane' \
+	--last_name='Smith' \
+	--path=/var/www/html
 
 # we cannot create API keys for the API, so we using basic auth, this plugin allows that.
 wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate
diff --git a/tests/e2e/env/CHANGELOG.md b/tests/e2e/env/CHANGELOG.md
index 4b0fa6d81e5..bf567bbe49a 100644
--- a/tests/e2e/env/CHANGELOG.md
+++ b/tests/e2e/env/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Unreleased
 
+## Added
+
+- `takeScreenshotFor` utility function to take screenshots within tests
+- `sendFailedTestScreenshotToSlack` to send the screenshot to the configured Slack channel
+- `sendFailedTestMessageToSlack` to send the context for screenshot to the configured Slack channel
+- `toBeInRange` expect numeric range matcher
 
 # 0.2.1
 
diff --git a/tests/e2e/env/README.md b/tests/e2e/env/README.md
index 121e52440f1..c79723412d2 100644
--- a/tests/e2e/env/README.md
+++ b/tests/e2e/env/README.md
@@ -79,6 +79,12 @@ The test sequencer provides a screenshot function for test failures. To enable s
 WC_E2E_SCREENSHOTS=1 npx wc-e2e test:e2e
 ```
 
+To take adhoc in test screenshots use
+
+```js
+await takeScreenshotFor( 'name of current step' );
+```
+
 Screenshots will be saved to `tests/e2e/screenshots`. This folder is cleared at the beginning of each test run.
 
 ### Jest Puppeteer Config
@@ -147,6 +153,7 @@ To implement the Slackbot in your CI:
   - `files:write`
   - `incoming-webhook`
 - Add the app to your channel
+- Invite the Slack app user to your channel `/invite @your-slackbot-user`
 - In your CI environment
   - Add the environment variable `WC_E2E_SCREENSHOTS=1`
   - Add your app Oauth token to a CI secret `E2E_SLACK_TOKEN`
diff --git a/tests/e2e/env/bin/docker-compose.js b/tests/e2e/env/bin/docker-compose.js
index 33744824a8b..2f9aeaec218 100755
--- a/tests/e2e/env/bin/docker-compose.js
+++ b/tests/e2e/env/bin/docker-compose.js
@@ -43,7 +43,10 @@ if ( appPath ) {
             if ( ! fs.existsSync( customInitFile ) ) {
                 customInitFile = '';
             }
+        } else {
+            customInitFile = '';
         }
+
         const appInitFile = customInitFile ? customInitFile : path.resolve( appPath, 'tests/e2e/docker/initialize.sh' );
         // If found, copy it into the wp-cli Docker context so
         // it gets picked up by the entrypoint script.
diff --git a/tests/e2e/env/config/custom-environment-variables.json b/tests/e2e/env/config/custom-environment-variables.json
new file mode 100644
index 00000000000..5961ecb534c
--- /dev/null
+++ b/tests/e2e/env/config/custom-environment-variables.json
@@ -0,0 +1,13 @@
+{
+  "url": "SMOKE_TEST_URL",
+  "users": {
+    "admin": {
+      "username": "SMOKE_TEST_ADMIN_USER",
+      "password": "SMOKE_TEST_ADMIN_PASSWORD"
+    },
+    "customer": {
+      "username": "SMOKE_TEST_CUSTOMER_USER",
+      "password": "SMOKE_TEST_CUSTOMER_PASSWORD"
+    }
+  }
+}
diff --git a/tests/e2e/env/index.js b/tests/e2e/env/index.js
index 286f449ee03..d7289c77e66 100644
--- a/tests/e2e/env/index.js
+++ b/tests/e2e/env/index.js
@@ -5,6 +5,7 @@ const babelConfig = require( './babel.config' );
 const esLintConfig = require( './.eslintrc.js' );
 const allE2EConfig = require( './config' );
 const allE2EUtils = require( './utils' );
+const slackUtils = require( './src/slack' );
 /**
  * External dependencies
  */
@@ -16,4 +17,5 @@ module.exports = {
 	...allE2EConfig,
 	...allE2EUtils,
 	...allPuppeteerUtils,
+	...slackUtils,
 };
diff --git a/tests/e2e/env/package-lock.json b/tests/e2e/env/package-lock.json
index 0b7e8c5a069..2766327b895 100644
--- a/tests/e2e/env/package-lock.json
+++ b/tests/e2e/env/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@woocommerce/e2e-environment",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/tests/e2e/env/src/setup/jest.failure.js b/tests/e2e/env/src/setup/jest.failure.js
index 31a906a10ee..7eb0947a784 100644
--- a/tests/e2e/env/src/setup/jest.failure.js
+++ b/tests/e2e/env/src/setup/jest.failure.js
@@ -4,10 +4,8 @@ import {
 	sendFailedTestMessageToSlack,
 } from '../slack';
 
-const path = require( 'path' );
-const mkdirp = require( 'mkdirp' );
 import { bind } from 'jest-each';
-const { getAppRoot } = require( '../../utils' );
+const { takeScreenshotFor } = require( '../../utils' );
 
 /**
  * Override the test case method so we can take screenshots of assertion failures.
@@ -88,22 +86,11 @@ const screenshotTest = async ( testName, callback ) => {
 	try {
 		await callback();
 	} catch ( e ) {
-		const testTitle = testName.replace( /\.$/, '' );
-		const appPath = getAppRoot();
-		const savePath = path.resolve( appPath, 'tests/e2e/screenshots' );
-		const filePath = path.join(
-			savePath,
-			`${ testTitle }.png`.replace( /[^a-z0-9.-]+/gi, '-' )
-		);
-
-		mkdirp.sync( savePath );
-		await page.screenshot( {
-			path: filePath,
-			fullPage: true,
-		} );
-
-		await sendFailedTestMessageToSlack( testTitle );
-		await sendFailedTestScreenshotToSlack( filePath );
+		const { title, filePath } = await takeScreenshotFor( testName );
+		await sendFailedTestMessageToSlack( title );
+		if ( filePath ) {
+			await sendFailedTestScreenshotToSlack( filePath );
+		}
 
 		throw ( e );
 	}
diff --git a/tests/e2e/env/src/setup/jest.setup.js b/tests/e2e/env/src/setup/jest.setup.js
index a312c46635e..0e438dfff54 100644
--- a/tests/e2e/env/src/setup/jest.setup.js
+++ b/tests/e2e/env/src/setup/jest.setup.js
@@ -51,37 +51,6 @@ async function setupBrowser() {
 	await setBrowserViewport( 'large' );
 }
 
-/**
- * Navigates to woocommerce import page and imports sample products.
- *
- * @return {Promise} Promise resolving once products have been imported.
- */
-async function importSampleProducts() {
-	await switchUserToAdmin();
-	// Visit Import Products page.
-	await visitAdminPage(
-		'edit.php',
-		'post_type=product&page=product_importer'
-	);
-	await page.click( 'a.woocommerce-importer-toggle-advanced-options' );
-	await page.focus( '#woocommerce-importer-file-url' );
-	// local path for sample data that is included with woo.
-	await page.keyboard.type(
-		'wp-content/plugins/woocommerce/sample-data/sample_products.csv'
-	);
-	await page.click( '.wc-actions .button-next' );
-	await page.waitForSelector( '.wc-importer-mapping-table' );
-	await page.select(
-		'.wc-importer-mapping-table tr:nth-child(29) select',
-		''
-	);
-	await page.click( '.wc-actions .button-next' );
-	await page.waitForXPath(
-		"//*[@class='woocommerce-importer-done' and contains(., 'Import complete! ')]"
-	);
-	await switchUserToTest();
-}
-
 /**
  * Adds an event listener to the page to handle additions of page event
  * handlers, to assure that they are removed at test teardown.
@@ -101,6 +70,23 @@ function removePageEvents() {
 	} );
 }
 
+/**
+ * Add an expect range matcher.
+ * @see https://jestjs.io/docs/expect#expectextendmatchers
+ */
+expect.extend({
+	toBeInRange: function (received, floor, ceiling) {
+		const pass = received >= floor && received <= ceiling;
+		const condition = pass ? 'not to be' : 'to be';
+
+		return {
+			message: () =>
+				`expected ${received} ${condition} within range ${floor} - ${ceiling}`,
+			pass,
+		};
+	},
+});
+
 /**
  * Adds a page event handler to emit uncaught exception to process if one of
  * the observed console logging types is encountered.
diff --git a/tests/e2e/env/src/slack/index.js b/tests/e2e/env/src/slack/index.js
index aeab8f42dd6..f03502673ed 100644
--- a/tests/e2e/env/src/slack/index.js
+++ b/tests/e2e/env/src/slack/index.js
@@ -1 +1,3 @@
-export * from './reporter';
+const slackUtils = require( './reporter' );
+
+module.exports = slackUtils;
diff --git a/tests/e2e/env/src/slack/reporter.js b/tests/e2e/env/src/slack/reporter.js
index 7e690102dbf..79655089a14 100644
--- a/tests/e2e/env/src/slack/reporter.js
+++ b/tests/e2e/env/src/slack/reporter.js
@@ -1,5 +1,6 @@
 const { createReadStream } = require( 'fs' );
 const { WebClient, ErrorCode } = require( '@slack/web-api' );
+const { getTestConfig } = require( '../../utils' );
 const {
 	GITHUB_ACTIONS,
 	GITHUB_REF,
@@ -37,7 +38,12 @@ const initializeSlack = () => {
 		return false;
 	}
 	if ( ! GITHUB_ACTIONS && ! TRAVIS_PULL_REQUEST_BRANCH ) {
-		return false;
+		const testConfig = getTestConfig();
+		return {
+			branch: 'local environment',
+			commit: 'latest',
+			webUrl: testConfig.url,
+		};
 	}
 	// Build PR info
 	if ( GITHUB_ACTIONS ) {
@@ -63,7 +69,7 @@ const initializeSlack = () => {
  * @param testName
  * @returns {Promise<void>}
  */
-export async function sendFailedTestMessageToSlack( testName ) {
+async function sendFailedTestMessageToSlack( testName ) {
 	const { branch, commit, webUrl } = initializeSlack();
 	if ( ! branch ) {
 		return;
@@ -80,7 +86,9 @@ export async function sendFailedTestMessageToSlack( testName ) {
 		// Check the code property and log the response
 		if ( error.code === ErrorCode.PlatformError || error.code === ErrorCode.RequestError ||
 			error.code === ErrorCode.RateLimitedError || error.code === ErrorCode.HTTPError ) {
-			console.log( error.data );
+			if ( error.data.error != 'channel_not_found' ) {
+				console.log(error.data);
+			}
 		} else {
 			// Some other error, oh no!
 			console.log(
@@ -119,7 +127,7 @@ export async function sendFailedTestMessageToSlack( testName ) {
  * @param screenshotOfFailedTest
  * @returns {Promise<void>}
  */
-export async function sendFailedTestScreenshotToSlack( screenshotOfFailedTest ) {
+async function sendFailedTestScreenshotToSlack( screenshotOfFailedTest ) {
 	const pr = initializeSlack();
 	if ( ! pr ) {
 		return;
@@ -146,3 +154,8 @@ export async function sendFailedTestScreenshotToSlack( screenshotOfFailedTest )
 		}
 	}
 }
+
+module.exports = {
+	sendFailedTestMessageToSlack,
+	sendFailedTestScreenshotToSlack,
+};
diff --git a/tests/e2e/env/utils/index.js b/tests/e2e/env/utils/index.js
index ce89ae395f7..bb6331f46bb 100644
--- a/tests/e2e/env/utils/index.js
+++ b/tests/e2e/env/utils/index.js
@@ -1,6 +1,7 @@
 const getAppRoot = require( './app-root' );
 const { getAppName, getAppBase } = require( './app-name' );
 const { getTestConfig, getAdminConfig } = require( './test-config' );
+const takeScreenshotFor = require( './take-screenshot' );
 
 module.exports = {
 	getAppBase,
@@ -8,4 +9,5 @@ module.exports = {
 	getAppName,
 	getTestConfig,
 	getAdminConfig,
+	takeScreenshotFor,
 };
diff --git a/tests/e2e/env/utils/take-screenshot.js b/tests/e2e/env/utils/take-screenshot.js
new file mode 100644
index 00000000000..25ac2fca905
--- /dev/null
+++ b/tests/e2e/env/utils/take-screenshot.js
@@ -0,0 +1,37 @@
+const path = require( 'path' );
+const mkdirp = require( 'mkdirp' );
+const getAppRoot = require( './app-root' );
+
+/**
+ * Take a screenshot if browser context exists.
+ * @param message
+ * @returns {Promise<{filePath: string, title: string}|{filePath: *, title: *}>}
+ */
+const takeScreenshotFor = async ( message ) => {
+	const title = message.replace( /\.$/, '' );
+	const appPath = getAppRoot();
+	const savePath = path.resolve( appPath, 'tests/e2e/screenshots' );
+	const filePath = path.join(
+		savePath,
+		`${ title }.png`.replace( /[^a-z0-9.-]+/gi, '-' )
+	);
+
+	mkdirp.sync( savePath );
+	try {
+		await page.screenshot({
+			path: filePath,
+			fullPage: true,
+		});
+	} catch ( error ) {
+		return {
+			title,
+			filePath: '',
+		};
+	}
+	return {
+		title,
+		filePath,
+	};
+};
+
+module.exports = takeScreenshotFor;
diff --git a/tests/e2e/env/utils/test-config.js b/tests/e2e/env/utils/test-config.js
index 652e30f3a68..8b1d419f3eb 100644
--- a/tests/e2e/env/utils/test-config.js
+++ b/tests/e2e/env/utils/test-config.js
@@ -19,10 +19,30 @@ if ( fs.existsSync( localTestConfigFile ) ) {
 	);
 }
 
+/**
+ * Get test container configuration.
+ * @returns {any}
+ */
 const getTestConfig = () => {
 	const rawTestConfig = fs.readFileSync( testConfigFile );
+	const config = require( 'config' );
+	const url = config.get( 'url' );
+	const users = config.get( 'users' );
 
+	// Support for environment variable overrides.
 	let testConfig = JSON.parse( rawTestConfig );
+	if ( url ) {
+		testConfig.url = url;
+	}
+	if ( users ) {
+		if ( users.admin ) {
+			testConfig.users.admin = users.admin;
+		}
+		if ( users.customer ) {
+			testConfig.users.customer = users.customer;
+		}
+	}
+
 	let testPort = testConfig.url.match( /[0-9]+/ );
 	testConfig.baseUrl = testConfig.url.substr( 0, testConfig.url.length - 1 );
 	if ( Array.isArray( testPort ) ) {
diff --git a/tests/e2e/specs/activate-and-setup/test-activation.js b/tests/e2e/specs/activate-and-setup/activation.test.js
similarity index 100%
rename from tests/e2e/specs/activate-and-setup/test-activation.js
rename to tests/e2e/specs/activate-and-setup/activation.test.js
diff --git a/tests/e2e/specs/activate-and-setup/test-onboarding-tasklist.js b/tests/e2e/specs/activate-and-setup/onboarding-tasklist.test.js
similarity index 100%
rename from tests/e2e/specs/activate-and-setup/test-onboarding-tasklist.js
rename to tests/e2e/specs/activate-and-setup/onboarding-tasklist.test.js
diff --git a/tests/e2e/specs/activate-and-setup/test-initial-settings.js b/tests/e2e/specs/activate-and-setup/settings-initial.test.js
similarity index 100%
rename from tests/e2e/specs/activate-and-setup/test-initial-settings.js
rename to tests/e2e/specs/activate-and-setup/settings-initial.test.js
diff --git a/tests/e2e/specs/activate-and-setup/setup-onboarding.test.js b/tests/e2e/specs/activate-and-setup/setup-onboarding.js
similarity index 100%
rename from tests/e2e/specs/activate-and-setup/setup-onboarding.test.js
rename to tests/e2e/specs/activate-and-setup/setup-onboarding.js
diff --git a/tests/e2e/specs/front-end/test-cart.js b/tests/e2e/specs/front-end/cart-begin.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-cart.js
rename to tests/e2e/specs/front-end/cart-begin.test.js
diff --git a/tests/e2e/specs/front-end/cart-calculate-shipping.test.js b/tests/e2e/specs/front-end/cart-calculate-shipping.test.js
new file mode 100644
index 00000000000..6ee84f7b8f2
--- /dev/null
+++ b/tests/e2e/specs/front-end/cart-calculate-shipping.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runCartCalculateShippingTest } = require( '@woocommerce/e2e-core-tests' );
+
+runCartCalculateShippingTest();
diff --git a/tests/e2e/specs/front-end/test-cart-coupons.js b/tests/e2e/specs/front-end/cart-coupons.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-cart-coupons.js
rename to tests/e2e/specs/front-end/cart-coupons.test.js
diff --git a/tests/e2e/specs/front-end/cart-redirection.cart.js b/tests/e2e/specs/front-end/cart-redirection.cart.js
new file mode 100644
index 00000000000..c269788a2bb
--- /dev/null
+++ b/tests/e2e/specs/front-end/cart-redirection.cart.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runCartRedirectionTest } = require( '@woocommerce/e2e-core-tests' );
+
+runCartRedirectionTest();
diff --git a/tests/e2e/specs/front-end/test-checkout.js b/tests/e2e/specs/front-end/checkout-begin.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-checkout.js
rename to tests/e2e/specs/front-end/checkout-begin.test.js
diff --git a/tests/e2e/specs/front-end/test-checkout-coupons.js b/tests/e2e/specs/front-end/checkout-coupons.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-checkout-coupons.js
rename to tests/e2e/specs/front-end/checkout-coupons.test.js
diff --git a/tests/e2e/specs/front-end/test-checkout-create-account.js b/tests/e2e/specs/front-end/checkout-create-account.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-checkout-create-account.js
rename to tests/e2e/specs/front-end/checkout-create-account.test.js
diff --git a/tests/e2e/specs/front-end/checkout-login-account.test.js b/tests/e2e/specs/front-end/checkout-login-account.test.js
new file mode 100644
index 00000000000..1bf304e04ad
--- /dev/null
+++ b/tests/e2e/specs/front-end/checkout-login-account.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runCheckoutLoginAccountTest } = require( '@woocommerce/e2e-core-tests' );
+
+runCheckoutLoginAccountTest();
diff --git a/tests/e2e/specs/front-end/my-account-create-account.test.js b/tests/e2e/specs/front-end/my-account-create-account.test.js
new file mode 100644
index 00000000000..cfcbfdc780b
--- /dev/null
+++ b/tests/e2e/specs/front-end/my-account-create-account.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runMyAccountCreateAccountTest } = require( '@woocommerce/e2e-core-tests' );
+
+runMyAccountCreateAccountTest();
diff --git a/tests/e2e/specs/front-end/test-my-account-pay-order.js b/tests/e2e/specs/front-end/my-account-pay-order.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-my-account-pay-order.js
rename to tests/e2e/specs/front-end/my-account-pay-order.test.js
diff --git a/tests/e2e/specs/front-end/test-my-account.js b/tests/e2e/specs/front-end/my-account.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-my-account.js
rename to tests/e2e/specs/front-end/my-account.test.js
diff --git a/tests/e2e/specs/front-end/order-email-receiving.test.js b/tests/e2e/specs/front-end/order-email-receiving.test.js
new file mode 100644
index 00000000000..a85e21d0c22
--- /dev/null
+++ b/tests/e2e/specs/front-end/order-email-receiving.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runOrderEmailReceivingTest } = require( '@woocommerce/e2e-core-tests' );
+
+runOrderEmailReceivingTest();
diff --git a/tests/e2e/specs/front-end/test-product-browse-search-sort.js b/tests/e2e/specs/front-end/product-browse-search-sort.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-product-browse-search-sort.js
rename to tests/e2e/specs/front-end/product-browse-search-sort.test.js
diff --git a/tests/e2e/specs/front-end/shopper.test.js b/tests/e2e/specs/front-end/shopper.js
similarity index 100%
rename from tests/e2e/specs/front-end/shopper.test.js
rename to tests/e2e/specs/front-end/shopper.js
diff --git a/tests/e2e/specs/front-end/test-single-product-page.js b/tests/e2e/specs/front-end/single-product-page.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-single-product-page.js
rename to tests/e2e/specs/front-end/single-product-page.test.js
diff --git a/tests/e2e/specs/front-end/test-variable-product-updates.js b/tests/e2e/specs/front-end/variable-product-updates.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-variable-product-updates.js
rename to tests/e2e/specs/front-end/variable-product-updates.test.js
diff --git a/tests/e2e/specs/rest-api/order.js b/tests/e2e/specs/rest-api/order.js
new file mode 100644
index 00000000000..d73a8be5f28
--- /dev/null
+++ b/tests/e2e/specs/rest-api/order.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runOrderApiTest } = require( '@woocommerce/e2e-core-tests' );
+
+runOrderApiTest();
diff --git a/tests/e2e/specs/wp-admin/test-analytics-page-loads.js b/tests/e2e/specs/wp-admin/analytics-page-loads.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-analytics-page-loads.js
rename to tests/e2e/specs/wp-admin/analytics-page-loads.test.js
diff --git a/tests/e2e/specs/wp-admin/test-create-coupon.js b/tests/e2e/specs/wp-admin/create-coupon.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-create-coupon.js
rename to tests/e2e/specs/wp-admin/create-coupon.test.js
diff --git a/tests/e2e/specs/wp-admin/test-create-order.js b/tests/e2e/specs/wp-admin/create-order.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-create-order.js
rename to tests/e2e/specs/wp-admin/create-order.test.js
diff --git a/tests/e2e/specs/wp-admin/create-shipping-classes.test.js b/tests/e2e/specs/wp-admin/create-shipping-classes.test.js
new file mode 100644
index 00000000000..5b51054cb7d
--- /dev/null
+++ b/tests/e2e/specs/wp-admin/create-shipping-classes.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runAddShippingClassesTest } = require( '@woocommerce/e2e-core-tests' );
+
+runAddShippingClassesTest();
diff --git a/tests/e2e/specs/wp-admin/test-add-shipping-zones.js b/tests/e2e/specs/wp-admin/create-shipping-zones.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-add-shipping-zones.js
rename to tests/e2e/specs/wp-admin/create-shipping-zones.test.js
diff --git a/tests/e2e/specs/wp-admin/test-add-simple-product.js b/tests/e2e/specs/wp-admin/create-simple-product.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-add-simple-product.js
rename to tests/e2e/specs/wp-admin/create-simple-product.test.js
diff --git a/tests/e2e/specs/wp-admin/test-add-variable-product.js b/tests/e2e/specs/wp-admin/create-variable-product.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-add-variable-product.js
rename to tests/e2e/specs/wp-admin/create-variable-product.test.js
diff --git a/tests/e2e/specs/wp-admin/merchant.test.js b/tests/e2e/specs/wp-admin/merchant.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/merchant.test.js
rename to tests/e2e/specs/wp-admin/merchant.js
diff --git a/tests/e2e/specs/wp-admin/test-order-apply-coupon.js b/tests/e2e/specs/wp-admin/order-coupon.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-order-apply-coupon.js
rename to tests/e2e/specs/wp-admin/order-coupon.test.js
diff --git a/tests/e2e/specs/wp-admin/test-order-customer-payment-page.js b/tests/e2e/specs/wp-admin/order-customer-payment-page.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-order-customer-payment-page.js
rename to tests/e2e/specs/wp-admin/order-customer-payment-page.test.js
diff --git a/tests/e2e/specs/wp-admin/test-edit-order.js b/tests/e2e/specs/wp-admin/order-edit.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-edit-order.js
rename to tests/e2e/specs/wp-admin/order-edit.test.js
diff --git a/tests/e2e/specs/wp-admin/test-order-refund.js b/tests/e2e/specs/wp-admin/order-refund.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-order-refund.js
rename to tests/e2e/specs/wp-admin/order-refund.test.js
diff --git a/tests/e2e/specs/wp-admin/test-order-searching.js b/tests/e2e/specs/wp-admin/order-searching.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-order-searching.js
rename to tests/e2e/specs/wp-admin/order-searching.test.js
diff --git a/tests/e2e/specs/wp-admin/test-order-status-filters.js b/tests/e2e/specs/wp-admin/order-status-filters.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-order-status-filters.js
rename to tests/e2e/specs/wp-admin/order-status-filters.test.js
diff --git a/tests/e2e/specs/wp-admin/test-product-edit.js b/tests/e2e/specs/wp-admin/product-edit.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-product-edit.js
rename to tests/e2e/specs/wp-admin/product-edit.test.js
diff --git a/tests/e2e/specs/wp-admin/product-import-csv.test.js b/tests/e2e/specs/wp-admin/product-import-csv.test.js
new file mode 100644
index 00000000000..1eb5d972074
--- /dev/null
+++ b/tests/e2e/specs/wp-admin/product-import-csv.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runImportProductsTest } = require( '@woocommerce/e2e-core-tests' );
+
+runImportProductsTest();
diff --git a/tests/e2e/specs/wp-admin/test-product-search.js b/tests/e2e/specs/wp-admin/product-search.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-product-search.js
rename to tests/e2e/specs/wp-admin/product-search.test.js
diff --git a/tests/e2e/specs/wp-admin/test-update-general-settings.js b/tests/e2e/specs/wp-admin/update-general-settings.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-update-general-settings.js
rename to tests/e2e/specs/wp-admin/update-general-settings.test.js
diff --git a/tests/e2e/specs/wp-admin/test-update-product-settings.js b/tests/e2e/specs/wp-admin/update-product-settings.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-update-product-settings.js
rename to tests/e2e/specs/wp-admin/update-product-settings.test.js
diff --git a/tests/e2e/specs/wp-admin/test-update-tax-settings.js b/tests/e2e/specs/wp-admin/update-tax-settings.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-update-tax-settings.js
rename to tests/e2e/specs/wp-admin/update-tax-settings.test.js
diff --git a/tests/e2e/specs/wp-admin/wccom-connect.test.js b/tests/e2e/specs/wp-admin/wccom-connect.test.js
new file mode 100644
index 00000000000..a7b4cd8deed
--- /dev/null
+++ b/tests/e2e/specs/wp-admin/wccom-connect.test.js
@@ -0,0 +1,6 @@
+/*
+ * Internal dependencies
+ */
+const { runInitiateWccomConnectionTest } = require( '@woocommerce/e2e-core-tests' );
+
+runInitiateWccomConnectionTest();
diff --git a/tests/e2e/utils/CHANGELOG.md b/tests/e2e/utils/CHANGELOG.md
index e430ce8df00..5ead83a94ea 100644
--- a/tests/e2e/utils/CHANGELOG.md
+++ b/tests/e2e/utils/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Unreleased
 
+## Added
+
+- `emptyCart()` Shopper flow helper that empties the cart
+- `deleteAllShippingZones()` Delete all the existing shipping zones
+- constants
+  - `WP_ADMIN_POST_TYPE`
+  - `WP_ADMIN_NEW_POST_TYPE`
+  - `WP_ADMIN_ALL_COUPONS_VIEW`
+  - `WP_ADMIN_WC_HOME`
+  - `IS_RETEST_MODE`
+- `withRestApi` flow containing utility functions that manage data with the rest api
+- `waitForSelectorWithoutThrow` - conditionally wait for a selector without throwing an error
+
 # 0.1.4
 
 ## Fixed
diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md
index 95830e44f59..b6e75546e91 100644
--- a/tests/e2e/utils/README.md
+++ b/tests/e2e/utils/README.md
@@ -31,6 +31,51 @@ describe( 'Cart page', () => {
 } );
 ~~~
 
+### Retries
+
+This package provides support for enabling retries in tests:
+
+- In the test environment set `E2E_RETEST=1`.
+- To add conditional logic to your tests use the boolean constant `IS_RETEST_MODE`.
+
+### Available constants
+
+#### Dashboard
+
+- `WP_ADMIN_LOGIN` - WordPress login
+- `WP_ADMIN_DASHBOARD` - WordPress dashboard
+- `WP_ADMIN_PLUGINS` - Plugin list
+- `WP_ADMIN_PERMALINK_SETTINGS` - Permalink settings  
+- `WP_ADMIN_ALL_USERS_VIEW` - WordPress user list
+- `WP_ADMIN_POST_TYPE` - Post listing
+- `WP_ADMIN_NEW_POST_TYPE` - New post
+- `WP_ADMIN_ALL_COUPONS_VIEW` - Coupons list
+- `WP_ADMIN_NEW_COUPON` - New coupon
+- `WP_ADMIN_ALL_ORDERS_VIEW` - Orders list
+- `WP_ADMIN_NEW_ORDER` - New Order
+- `WP_ADMIN_ALL_PRODUCTS_VIEW` - Products list
+- `WP_ADMIN_NEW_PRODUCT` - New product
+- `WP_ADMIN_IMPORT_PRODUCTS` - Import products
+- `WP_ADMIN_PLUGIN_PAGE` - Plugin settings page root
+- `WP_ADMIN_WC_HOME` - WooCommerce home screen
+- `WP_ADMIN_SETUP_WIZARD` - WooCommerce setup/onboarding wizard
+- `WP_ADMIN_ANALYTICS_PAGES` - WooCommerce analytics page root
+- `WP_ADMIN_WC_SETTINGS` - WooCommerce settings page root
+- `WP_ADMIN_NEW_SHIPPING_ZONE` - WooCommerce new shipping zone
+- `WP_ADMIN_WC_EXTENSIONS` - WooCommerce extensions page
+
+#### Front end
+
+- `SHOP_PAGE` - Shop page
+- `SHOP_PRODUCT_PAGE` - Single product page 
+- `SHOP_CART_PAGE` - Cart page
+- `SHOP_CHECKOUT_PAGE` - Checkout page
+- `SHOP_MY_ACCOUNT_PAGE` - Customer account page
+- `MY_ACCOUNT_ORDERS` - Customer orders
+- `MY_ACCOUNT_DOWNLOADS` - Customer downloads
+- `MY_ACCOUNT_ADDRESSES` - Customer addresses
+- `MY_ACCOUNT_ACCOUNT_DETAILS` - Customer account details
+
 ## Test Function
 
 ### Merchant `merchant`
@@ -55,6 +100,8 @@ describe( 'Cart page', () => {
 | `openEmailLog` | | Open the WP Mail Log page |
 | `openAnalyticsPage` | | Open any Analytics page |
 | `openAllUsersView` | | Open the All Users page |
+| `openImportProducts` | | Open the Import Products page |
+| `openExtensions` | | Go to WooCommerce -> Extensions |
 
 ### Shopper `shopper`
 
@@ -78,7 +125,19 @@ describe( 'Cart page', () => {
 | `productIsInCheckout` | `productTitle, quantity, total, cartSubtotal` | Verify product is in cart on checkout page |
 | `removeFromCart` | `productTitle` | Remove a product from the cart on the cart page |
 | `setCartQuantity` | `productTitle, quantityValue` | Change the quantity of a product on the cart page |
-| `searchForProduct` | Searching for a product name and landing on its detail page |
+| `searchForProduct` | | Searching for a product name and landing on its detail page |
+|  `emptyCart` | | Removes any products and coupons that are in the cart |
+
+### REST API `withRestApi`
+
+| Function | Parameters | Description |
+|----------|------------|-------------|
+| `resetOnboarding` | | Reset onboarding settings |
+| `deleteAllCoupons` | | Permanently delete all coupons |
+| `deleteAllProducts` | | Permanently delete all products |
+| `deleteAllShippingZones` | | Permanently delete all shipping zones except the default |
+| `deleteCustomerByEmail` | `emailAddress` | Delete customer user account. Posts are reassigned to user ID 1 |
+| `resetSettingsGroupToDefault` | `settingsGroup` | Reset settings in settings group to default except `select` fields |
 
 ### Page Utilities
 
@@ -123,6 +182,8 @@ describe( 'Cart page', () => {
 | `removeCoupon` | | helper method that removes a single coupon within cart or checkout |
 | `selectOrderAction` | `action` | Helper method to select an order action in the `Order Actions` postbox |
 | `clickUpdateOrder` | `noticeText`, `waitForSave` | Helper method to click the Update button on the order details page |
+| `deleteAllShippingZones` | | Delete all the existing shipping zones |
+| `waitForSelectorWithoutThrow` | `selector`, `timeoutInSeconds` | conditionally wait for a selector without throwing an error. Default timeout is 5 seconds |
 
 ### Test Utilities
 
diff --git a/tests/e2e/utils/package-lock.json b/tests/e2e/utils/package-lock.json
index 8bc72f6a287..f7010d03dbb 100644
--- a/tests/e2e/utils/package-lock.json
+++ b/tests/e2e/utils/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@woocommerce/e2e-utils",
-	"version": "0.1.1",
+	"version": "0.1.4",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -39,16 +39,6 @@
 			"resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
 			"integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw=="
 		},
-		"@woocommerce/api": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@woocommerce/api/-/api-0.1.0.tgz",
-			"integrity": "sha512-OWXL2q6Yh1DBKBPLqqPG+YpCbXw1fW/lf0+v71Pwf+THutya9m02l9BFPnwEX46xONhn1ttDniePU1NtST9m7Q==",
-			"requires": {
-				"axios": "0.19.2",
-				"create-hmac": "1.1.7",
-				"oauth-1.0a": "2.2.6"
-			}
-		},
 		"@wordpress/deprecated": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-2.10.0.tgz",
@@ -112,14 +102,6 @@
 				"react-native-url-polyfill": "^1.1.2"
 			}
 		},
-		"axios": {
-			"version": "0.19.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-			"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-			"requires": {
-				"follow-redirects": "1.5.10"
-			}
-		},
 		"base64-js": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -134,46 +116,12 @@
 				"ieee754": "^1.1.4"
 			}
 		},
-		"cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+		"config": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/config/-/config-3.3.3.tgz",
+			"integrity": "sha512-T3RmZQEAji5KYqUQpziWtyGJFli6Khz7h0rpxDwYNjSkr5ynyTWwO7WpfjHzTXclNCDfSWQRcwMb+NwxJesCKw==",
 			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"create-hash": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"inherits": "^2.0.1",
-				"md5.js": "^1.3.4",
-				"ripemd160": "^2.0.1",
-				"sha.js": "^2.4.0"
-			}
-		},
-		"create-hmac": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-			"requires": {
-				"cipher-base": "^1.0.3",
-				"create-hash": "^1.1.0",
-				"inherits": "^2.0.1",
-				"ripemd160": "^2.0.0",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
-			}
-		},
-		"debug": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-			"requires": {
-				"ms": "2.0.0"
+				"json5": "^2.1.1"
 			}
 		},
 		"encoding": {
@@ -190,21 +138,13 @@
 			"integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw=="
 		},
 		"fishery": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fishery/-/fishery-1.0.1.tgz",
-			"integrity": "sha512-VV8H4ZuCbZ9cCWkrYWLLPoAfpTp0t+hlJVoNWkRRHdXOgQ08wjd8ab9di8/Ed/QhgwxY3h7Y17HgDZ9osaHSSQ==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/fishery/-/fishery-1.2.0.tgz",
+			"integrity": "sha512-0GG029KHF3p8Q0NiAl/ZOK1fvyAprOiHdtRWUNS46x9QXuQhMwzcGLNDbZ7XIEEBowwBmMsw7StkaU0ek9dSbg==",
 			"requires": {
 				"lodash.mergewith": "^4.6.2"
 			}
 		},
-		"follow-redirects": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-			"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-			"requires": {
-				"debug": "=3.1.0"
-			}
-		},
 		"gettext-parser": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
@@ -214,16 +154,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-			"requires": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			}
-		},
 		"iconv-lite": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
@@ -237,45 +167,38 @@
 			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
 			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-		},
 		"is-stream": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
 			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
 		"lodash": {
-			"version": "4.17.20",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
 		"lodash.mergewith": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
 			"integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
 		},
-		"md5.js": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
 		"memize": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/memize/-/memize-1.1.0.tgz",
 			"integrity": "sha512-K4FcPETOMTwe7KL2LK0orMhpOmWD2wRGwWWpbZy0fyArwsyIKR8YJVz8+efBAh3BO4zPqlSICu4vsLTRRqtFAg=="
 		},
-		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
 		},
 		"node-fetch": {
 			"version": "1.7.3",
@@ -286,11 +209,6 @@
 				"is-stream": "^1.0.1"
 			}
 		},
-		"oauth-1.0a": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/oauth-1.0a/-/oauth-1.0a-2.2.6.tgz",
-			"integrity": "sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ=="
-		},
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -309,30 +227,11 @@
 				"whatwg-url-without-unicode": "8.0.0-3"
 			}
 		},
-		"readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-			"requires": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			}
-		},
 		"regenerator-runtime": {
 			"version": "0.13.7",
 			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
 			"integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
 		},
-		"ripemd160": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1"
-			}
-		},
 		"safe-buffer": {
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -343,28 +242,11 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
-		"sha.js": {
-			"version": "2.4.11",
-			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
 		"sprintf-js": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
 			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
 		},
-		"string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"requires": {
-				"safe-buffer": "~5.2.0"
-			}
-		},
 		"tannin": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/tannin/-/tannin-1.2.0.tgz",
@@ -373,11 +255,6 @@
 				"@tannin/plural-forms": "^1.1.0"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
 		"webidl-conversions": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js
index c449622937b..c5e3daf7f51 100644
--- a/tests/e2e/utils/src/components.js
+++ b/tests/e2e/utils/src/components.js
@@ -5,17 +5,22 @@
 /**
  * Internal dependencies
  */
-import { merchant } from './flows';
+import { merchant, IS_RETEST_MODE } from './flows';
 import {
 	clickTab,
 	uiUnblocked,
 	verifyCheckboxIsUnset,
 	selectOptionInSelect2,
 	setCheckbox,
-	unsetCheckbox
+	unsetCheckbox,
+	evalAndClick,
+	backboneUnblocked,
+	waitForSelectorWithoutThrow,
 } from './page-utils';
 import factories from './factories';
+import { Coupon } from '@woocommerce/api';
 
+const client = factories.api.withDefaultPermalinks;
 const config = require( 'config' );
 const simpleProductName = config.get( 'products.simple.name' );
 const simpleProductPrice = config.has('products.simple.price') ? config.get('products.simple.price') : '9.99';
@@ -56,6 +61,7 @@ const waitAndClickPrimary = async ( waitForNetworkIdle = true ) => {
  */
 const completeOnboardingWizard = async () => {
 	// Store Details section
+	await merchant.runSetupWizard();
 
 	// Fill store's address - first line
 	await expect( page ).toFill( '#inspector-text-control-0', config.get( 'addresses.admin.store.addressfirstline' ) );
@@ -81,23 +87,20 @@ const completeOnboardingWizard = async () => {
 	// Click on "Continue" button to move to the next step
 	await page.click( 'button.is-primary', { text: 'Continue' } );
 
-	// Wait for usage tracking pop-up window to appear
-	await page.waitForSelector( '.components-modal__header-heading' );
-	await expect( page ).toMatchElement(
-		'.components-modal__header-heading', { text: 'Build a better WooCommerce' }
-	);
+	// Wait for usage tracking pop-up window to appear on a new site
+	const usageTrackingHeader = await page.$('.components-modal__header-heading');
+	if ( usageTrackingHeader ) {
+		await expect(page).toMatchElement(
+			'.components-modal__header-heading', {text: 'Build a better WooCommerce'}
+		);
 
-	// Query for "Continue" buttons
-	const continueButtons = await page.$$( 'button.is-primary' );
-	expect( continueButtons ).toHaveLength( 2 );
+		// Query for "Continue" buttons
+		const continueButtons = await page.$$( 'button.is-primary' );
+		expect( continueButtons ).toHaveLength( 2 );
 
-	await Promise.all( [
-		// Click on "Continue" button of the usage pop-up window to move to the next step
-		continueButtons[1].click(),
-
-		// Wait for "In which industry does the store operate?" section to load
-		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
-	] );
+		await continueButtons[1].click();
+	}
+	await page.waitForNavigation( { waitUntil: 'networkidle0' } );
 
 	// Industry section
 
@@ -158,26 +161,24 @@ const completeOnboardingWizard = async () => {
 	await waitAndClickPrimary();
 
 	// End of onboarding wizard
+	if ( IS_RETEST_MODE ) {
+		// Home screen modal can't be reset via the rest api.
+		return;
+	}
 
 	// Wait for homescreen welcome modal to appear
-	await page.waitForSelector( '.woocommerce__welcome-modal__page-content__header' );
-	await expect( page ).toMatchElement(
-		'.woocommerce__welcome-modal__page-content__header', { text: 'Welcome to your WooCommerce store\’s online HQ!' }
-	);
-
-	// Wait for "Next" button to become active
-	await page.waitForSelector( 'button.components-guide__forward-button' );
-	// Click on "Next" button to move to the next step
-	await page.click( 'button.components-guide__forward-button' );
-
-	// Wait for "Next" button to become active
-	await page.waitForSelector( 'button.components-guide__forward-button' );
-	// Click on "Next" button to move to the next step
-	await page.click( 'button.components-guide__forward-button' );
+	let welcomeHeader = await waitForSelectorWithoutThrow( '.woocommerce__welcome-modal__page-content' );
+	if ( ! welcomeHeader ) {
+		return;
+	}
 
+	// Click two Next buttons
+	for ( let b = 0; b < 2; b++ ) {
+		await page.waitForSelector('button.components-guide__forward-button');
+		await page.click('button.components-guide__forward-button');
+	}
 	// Wait for "Let's go" button to become active
 	await page.waitForSelector( 'button.components-guide__finish-button' );
-	// Click on "Let's go" button to move to the next step
 	await page.click( 'button.components-guide__finish-button' );
 };
 
@@ -430,11 +431,12 @@ const addProductToOrder = async ( orderId, productName ) => {
 	await expect( page ).toClick( 'button.add-order-item' );
 	await page.waitForSelector( '.wc-backbone-modal-header' );
 	await expect( page ).toClick( '.wc-backbone-modal-content .wc-product-search' );
-	await expect( page ).toFill( '#wc-backbone-modal-dialog + .select2-container .select2-search__field', productName );
+	await expect( page ).toFill('#wc-backbone-modal-dialog + .select2-container .select2-search__field', productName);
+	await page.waitForSelector( 'li[aria-selected="true"]', { timeout: 10000 } );
 	await expect( page ).toClick( 'li[aria-selected="true"]' );
 	await page.click( '.wc-backbone-modal-content #btn-ok' );
 
-	await uiUnblocked();
+	await backboneUnblocked();
 
 	// Verify the product we added shows as a line item now
 	await expect( page ).toMatchElement( '.wc-order-item-name', { text: productName } );
@@ -447,23 +449,29 @@ const addProductToOrder = async ( orderId, productName ) => {
  * @param discountType Type of a coupon. Defaults to Fixed cart discount.
  */
 const createCoupon = async ( couponAmount = '5', discountType = 'Fixed cart discount' ) => {
-	await merchant.openNewCoupon();
+	let couponType;
+	switch ( discountType ) {
+		case "Fixed cart discount":
+			couponType = 'fixed_cart';
+			break;
+		case "Fixed product discount":
+			couponType = 'fixed_product';
+			break;
+		case "Percentage discount":
+			couponType = 'percent';
+			break;
+		default:
+			couponType = discountType;
+	}
 
 	// Fill in coupon code
-	let couponCode = 'Code-' + discountType + new Date().getTime().toString();
-	await expect(page).toFill( '#title', couponCode );
-
-	// Set general coupon data
-	await clickTab( 'General' );
-	await expect(page).toSelect( '#discount_type', discountType );
-	await expect(page).toFill( '#coupon_amount', couponAmount );
-
-	// Publish coupon
-	await expect( page ).toClick( '#publish' );
-	await page.waitForSelector( '.updated.notice' );
-
-	// Verify
-	await expect( page ).toMatchElement( '.updated.notice', { text: 'Coupon updated.' } );
+	let couponCode = 'code-' + couponType + new Date().getTime().toString();
+	const repository = Coupon.restRepository( client );
+	await repository.create( {
+		code: couponCode,
+		discountType: couponType,
+		amount: couponAmount,
+	});
 
 	return couponCode;
 };
@@ -538,6 +546,33 @@ const deleteAllEmailLogs = async () => {
 	}
 };
 
+/**
+ * Delete all the existing shipping zones.
+ */
+const deleteAllShippingZones = async () => {
+	await merchant.openSettings('shipping');
+
+	// Delete existing shipping zones.
+	try {
+		let zone = await page.$( '.wc-shipping-zone-delete' );
+		if ( zone ) {
+			// WP action links aren't clickable because they are hidden with a left=-9999 style.
+			await page.evaluate(() => {
+				document.querySelector('.wc-shipping-zone-name .row-actions')
+					.style
+					.left = '0';
+			});
+			while ( zone ) {
+				await evalAndClick( '.wc-shipping-zone-delete' );
+				await uiUnblocked();
+				zone = await page.$( '.wc-shipping-zone-delete' );
+			};
+		};
+	} catch (error) {
+		// Prevent an error here causing the test to fail.
+	};
+};
+
 export {
 	completeOnboardingWizard,
 	createSimpleProduct,
@@ -551,4 +586,5 @@ export {
 	createSimpleProductWithCategory,
 	clickUpdateOrder,
 	deleteAllEmailLogs,
+	deleteAllShippingZones,
 };
diff --git a/tests/e2e/utils/src/flows/constants.js b/tests/e2e/utils/src/flows/constants.js
index bcf4d6b3419..70e1e8f4fc3 100644
--- a/tests/e2e/utils/src/flows/constants.js
+++ b/tests/e2e/utils/src/flows/constants.js
@@ -2,31 +2,61 @@
  * External dependencies
  */
 const config = require( 'config' );
-
 const baseUrl = config.get( 'url' );
 
+/**
+ * WordPress core dashboard pages.
+ * @type {string}
+ */
 export const WP_ADMIN_LOGIN = baseUrl + 'wp-login.php';
-export const WP_ADMIN_DASHBOARD = baseUrl + 'wp-admin';
-export const WP_ADMIN_PLUGINS = baseUrl + 'wp-admin/plugins.php';
-export const WP_ADMIN_SETUP_WIZARD = baseUrl + 'wp-admin/admin.php?page=wc-admin';
-export const WP_ADMIN_ALL_ORDERS_VIEW = baseUrl + 'wp-admin/edit.php?post_type=shop_order';
-export const WP_ADMIN_ALL_PRODUCTS_VIEW = baseUrl + 'wp-admin/edit.php?post_type=product';
-export const WP_ADMIN_NEW_COUPON = baseUrl + 'wp-admin/post-new.php?post_type=shop_coupon';
-export const WP_ADMIN_NEW_ORDER = baseUrl + 'wp-admin/post-new.php?post_type=shop_order';
-export const WP_ADMIN_NEW_PRODUCT = baseUrl + 'wp-admin/post-new.php?post_type=product';
-export const WP_ADMIN_WC_SETTINGS = baseUrl + 'wp-admin/admin.php?page=wc-settings&tab=';
-export const WP_ADMIN_PERMALINK_SETTINGS = baseUrl + 'wp-admin/options-permalink.php';
-export const WP_ADMIN_NEW_SHIPPING_ZONE = baseUrl + 'wp-admin/admin.php?page=wc-settings&tab=shipping&zone_id=new';
-export const WP_ADMIN_ANALYTICS_PAGES = baseUrl + 'wp-admin/admin.php?page=wc-admin&path=%2Fanalytics%2F';
-export const WP_ADMIN_ALL_USERS_VIEW = baseUrl + 'wp-admin/users.php';
-
+export const WP_ADMIN_DASHBOARD = baseUrl + 'wp-admin/';
+export const WP_ADMIN_PLUGINS = WP_ADMIN_DASHBOARD + 'plugins.php';
+export const WP_ADMIN_PERMALINK_SETTINGS = WP_ADMIN_DASHBOARD + 'options-permalink.php';
+export const WP_ADMIN_ALL_USERS_VIEW = WP_ADMIN_DASHBOARD + 'users.php';
+/**
+ * WooCommerce core post type pages.
+ * @type {string}
+ */
+export const WP_ADMIN_POST_TYPE = WP_ADMIN_DASHBOARD + 'edit.php?post_type=';
+export const WP_ADMIN_NEW_POST_TYPE = WP_ADMIN_DASHBOARD + 'post-new.php?post_type=';
+export const WP_ADMIN_ALL_COUPONS_VIEW = WP_ADMIN_POST_TYPE + 'shop_coupon';
+export const WP_ADMIN_NEW_COUPON = WP_ADMIN_NEW_POST_TYPE + 'shop_coupon';
+export const WP_ADMIN_ALL_ORDERS_VIEW = WP_ADMIN_POST_TYPE + 'shop_order';
+export const WP_ADMIN_NEW_ORDER = WP_ADMIN_NEW_POST_TYPE + 'shop_order';
+export const WP_ADMIN_ALL_PRODUCTS_VIEW = WP_ADMIN_POST_TYPE + 'product';
+export const WP_ADMIN_NEW_PRODUCT = WP_ADMIN_NEW_POST_TYPE + 'product';
+export const WP_ADMIN_IMPORT_PRODUCTS = WP_ADMIN_ALL_PRODUCTS_VIEW + '&page=product_importer';
+/**
+ * WooCommerce settings pages.
+ * @type {string}
+ */
+export const WP_ADMIN_PLUGIN_PAGE = WP_ADMIN_DASHBOARD + 'admin.php?page=';
+export const WP_ADMIN_WC_HOME = WP_ADMIN_PLUGIN_PAGE + 'wc-admin';
+export const WP_ADMIN_SETUP_WIZARD = WP_ADMIN_WC_HOME + '&path=%2Fsetup-wizard';
+export const WP_ADMIN_ANALYTICS_PAGES = WP_ADMIN_WC_HOME + '&path=%2Fanalytics%2F';
+export const WP_ADMIN_WC_SETTINGS = WP_ADMIN_PLUGIN_PAGE + 'wc-settings&tab=';
+export const WP_ADMIN_NEW_SHIPPING_ZONE = WP_ADMIN_WC_SETTINGS + 'shipping&zone_id=new';
+export const WP_ADMIN_WC_EXTENSIONS = WP_ADMIN_PLUGIN_PAGE + 'wc-addons';
+/**
+ * Shop pages.
+ * @type {string}
+ */
 export const SHOP_PAGE = baseUrl + 'shop';
 export const SHOP_PRODUCT_PAGE = baseUrl + '?p=';
 export const SHOP_CART_PAGE = baseUrl + 'cart';
 export const SHOP_CHECKOUT_PAGE = baseUrl + 'checkout/';
 export const SHOP_MY_ACCOUNT_PAGE = baseUrl + 'my-account/';
+/**
+ * Customer account pages.
+ * @type {string}
+ */
+export const MY_ACCOUNT_ORDERS = SHOP_MY_ACCOUNT_PAGE + 'orders';
+export const MY_ACCOUNT_DOWNLOADS = SHOP_MY_ACCOUNT_PAGE + 'downloads';
+export const MY_ACCOUNT_ADDRESSES = SHOP_MY_ACCOUNT_PAGE + 'edit-address';
+export const MY_ACCOUNT_ACCOUNT_DETAILS = SHOP_MY_ACCOUNT_PAGE + 'edit-account';
 
-export const MY_ACCOUNT_ORDERS = baseUrl + 'my-account/orders';
-export const MY_ACCOUNT_DOWNLOADS = baseUrl + 'my-account/downloads';
-export const MY_ACCOUNT_ADDRESSES = baseUrl + 'my-account/edit-address';
-export const MY_ACCOUNT_ACCOUNT_DETAILS = baseUrl + 'my-account/edit-account';
+/**
+ * Test control flags.
+ * @type {boolean}
+ */
+export const IS_RETEST_MODE = process.env.E2E_RETEST == '1';
diff --git a/tests/e2e/utils/src/flows/index.js b/tests/e2e/utils/src/flows/index.js
index b4cf27fb868..93e71658f41 100644
--- a/tests/e2e/utils/src/flows/index.js
+++ b/tests/e2e/utils/src/flows/index.js
@@ -5,10 +5,12 @@ const flowConstants = require( './constants' );
 const flowExpressions = require( './expressions' );
 const merchant = require( './merchant' );
 const shopper = require( './shopper' );
+const { withRestApi } = require( './with-rest-api' );
 
 module.exports = {
 	...flowConstants,
 	...flowExpressions,
 	merchant,
 	shopper,
+	withRestApi,
 };
diff --git a/tests/e2e/utils/src/flows/merchant.js b/tests/e2e/utils/src/flows/merchant.js
index d8c4c7ad390..aa78a709f8e 100644
--- a/tests/e2e/utils/src/flows/merchant.js
+++ b/tests/e2e/utils/src/flows/merchant.js
@@ -18,10 +18,14 @@ const {
 	WP_ADMIN_PERMALINK_SETTINGS,
 	WP_ADMIN_PLUGINS,
 	WP_ADMIN_SETUP_WIZARD,
+	WP_ADMIN_WC_HOME,
 	WP_ADMIN_WC_SETTINGS,
+	WP_ADMIN_WC_EXTENSIONS,
 	WP_ADMIN_NEW_SHIPPING_ZONE,
 	WP_ADMIN_ANALYTICS_PAGES,
 	WP_ADMIN_ALL_USERS_VIEW,
+	WP_ADMIN_IMPORT_PRODUCTS,
+	IS_RETEST_MODE,
 } = require( './constants' );
 
 const baseUrl = config.get( 'url' );
@@ -53,9 +57,11 @@ const merchant = {
 			( am ) => am.filter( ( e ) => e.href ).map( ( e ) => e.href )
 		);
 
-		await page.goto( logoutLinks[ 0 ], {
-			waitUntil: 'networkidle0',
-		} );
+		if ( logoutLinks && logoutLinks[0] ) {
+			await page.goto(logoutLinks[0], {
+				waitUntil: 'networkidle0',
+			});
+		}
 	},
 
 	openAllOrdersView: async () => {
@@ -118,8 +124,15 @@ const merchant = {
 		} );
 	},
 
+	openExtensions: async () => {
+		await page.goto( WP_ADMIN_WC_EXTENSIONS, {
+			waitUntil: 'networkidle0',
+		} );
+	},
+
 	runSetupWizard: async () => {
-		await page.goto( WP_ADMIN_SETUP_WIZARD, {
+			const setupWizard = IS_RETEST_MODE ? WP_ADMIN_SETUP_WIZARD : WP_ADMIN_WC_HOME;
+			await page.goto( setupWizard, {
 			waitUntil: 'networkidle0',
 		} );
 	},
@@ -196,6 +209,12 @@ const merchant = {
 			waitUntil: 'networkidle0',
 		} );
 	},
+
+  openImportProducts: async () => {
+		await page.goto( WP_ADMIN_IMPORT_PRODUCTS , {
+			waitUntil: 'networkidle0',
+		} );
+	},
 };
 
 module.exports = merchant;
diff --git a/tests/e2e/utils/src/flows/shopper.js b/tests/e2e/utils/src/flows/shopper.js
index 8e4acad61f2..db347006ec3 100644
--- a/tests/e2e/utils/src/flows/shopper.js
+++ b/tests/e2e/utils/src/flows/shopper.js
@@ -24,6 +24,8 @@ const {
 	SHOP_PRODUCT_PAGE
 } = require( './constants' );
 
+const { uiUnblocked } = require( '../page-utils' );
+
 const gotoMyAccount = async () => {
 	await page.goto( SHOP_MY_ACCOUNT_PAGE, {
 		waitUntil: 'networkidle0',
@@ -127,6 +129,33 @@ const shopper = {
 		await removeButton.click();
 	},
 
+	emptyCart: async () => {
+		await page.goto( SHOP_CART_PAGE, {
+			waitUntil: 'networkidle0',
+		} );
+
+		// Remove products if they exist
+		if ( await page.$( '.remove' ) !== null ) {
+			products = await page.$( '.remove' );
+			while ( products && products.length > 0 ) {
+				for (let p = 0; p < products.length; p++ ) {
+					await page.click( p );
+					await uiUnblocked();
+				}
+				products = await page.$( '.remove' );
+			}
+		}
+
+		// Remove coupons if they exist
+		if ( await page.$( '.woocommerce-remove-coupon' ) !== null ) {
+			await page.click( '.woocommerce-remove-coupon' );
+			await uiUnblocked();
+		}
+
+		await page.waitForSelector('.woocommerce-info');
+		await expect( page ).toMatchElement( '.woocommerce-info', { text: 'Your cart is currently empty.' } );
+	},
+
 	setCartQuantity: async ( productTitle, quantityValue ) => {
 		const cartItemXPath = getCartItemExpression( productTitle );
 		const quantityInputXPath = cartItemXPath + '//' + getQtyInputExpression();
diff --git a/tests/e2e/utils/src/flows/with-rest-api.js b/tests/e2e/utils/src/flows/with-rest-api.js
new file mode 100644
index 00000000000..442d1d20a8c
--- /dev/null
+++ b/tests/e2e/utils/src/flows/with-rest-api.js
@@ -0,0 +1,152 @@
+import factories from '../factories';
+import {Coupon, Setting, SimpleProduct} from '@woocommerce/api';
+
+const client = factories.api.withDefaultPermalinks;
+const onboardingProfileEndpoint = '/wc-admin/onboarding/profile';
+const shippingZoneEndpoint = '/wc/v3/shipping/zones';
+const userEndpoint = '/wp/v2/users';
+
+/**
+ * Utility function to delete all merchant created data store objects.
+ *
+ * @param repository
+ * @param defaultObjectId
+ * @returns {Promise<void>}
+ */
+const deleteAllRepositoryObjects = async ( repository, defaultObjectId = null ) => {
+	let objects;
+	const minimum = defaultObjectId == null ? 0 : 1;
+
+	objects = await repository.list();
+	while ( objects.length > minimum ) {
+		for (let o = 0; o < objects.length; o++ ) {
+			// Skip default data store object
+			if ( objects[ o ].id == defaultObjectId ) {
+				continue;
+			}
+			// We may be getting a cached copy of the dataset and the object has already been deleted.
+			try {
+				await repository.delete(objects[o].id);
+			} catch (e) {}
+		}
+		objects = await repository.list();
+	}
+};
+
+/**
+ * Utility functions that use the REST API to process the requested function.
+ */
+export const withRestApi = {
+	/**
+	 * Reset onboarding to equivalent of new site.
+	 * @returns {Promise<void>}
+	 */
+	resetOnboarding: async () => {
+		const onboardingReset = {
+			completed: false,
+			industry: [],
+			business_extensions: [],
+			skipped: false,
+			product_types: [],
+			product_count: '0',
+			selling_venues: 'no',
+			revenue: 'none',
+			theme: '',
+			setup_client: false,
+			wccom_connected: false,
+		};
+
+		const response = await client.put( onboardingProfileEndpoint, onboardingReset );
+		expect( response.statusCode ).toEqual( 200 );
+	},
+	/**
+	 * Use api package to delete coupons.
+	 *
+	 * @return {Promise} Promise resolving once coupons have been deleted.
+	 */
+	deleteAllCoupons: async () => {
+		const repository = Coupon.restRepository( client );
+		await deleteAllRepositoryObjects( repository );
+	},
+	/**
+	 * Use api package to delete products.
+	 *
+	 * @return {Promise} Promise resolving once products have been deleted.
+	 */
+	deleteAllProducts: async () => {
+		const repository = SimpleProduct.restRepository( client );
+		await deleteAllRepositoryObjects( repository );
+	},
+	/**
+	 * Use api package to delete shipping zones.
+	 *
+	 * @return {Promise} Promise resolving once shipping zones have been deleted.
+	 */
+	deleteAllShippingZones: async () => {
+		const shippingZones = await client.get( shippingZoneEndpoint );
+		if ( shippingZones.data && shippingZones.data.length ) {
+			for ( let z = 0; z < shippingZones.data.length; z++ ) {
+				// The data store doesn't support deleting the default zone.
+				if ( shippingZones.data[z].id == 0 ) {
+					continue;
+				}
+				const response = await client.delete( shippingZoneEndpoint + `/${shippingZones.data[z].id}?force=true` );
+				expect( response.statusCode ).toBe( 200 );
+			}
+		}
+	},
+	/**
+	 * Delete a customer account by their email address if the user exists.
+	 *
+	 * @param emailAddress Customer user account email address.
+	 * @returns {Promise<void>}
+	 */
+	deleteCustomerByEmail: async ( emailAddress ) => {
+		const query = {
+			search: emailAddress,
+			context: 'edit',
+		};
+		const customers = await client.get( userEndpoint, query );
+
+		if ( customers.data && customers.data.length ) {
+			for ( let c = 0; c < customers.data.length; c++ ) {
+				const deleteUser = {
+					id: customers.data[c].id,
+					force: true,
+					reassign: 1,
+				}
+				await client.delete( userEndpoint + `/${ deleteUser.id }`, deleteUser );
+			}
+		}
+	},
+	/**
+	 * Reset a settings group to default values except selects.
+	 * @param settingsGroup
+	 * @returns {Promise<void>}
+	 */
+	resetSettingsGroupToDefault: async ( settingsGroup ) => {
+		const settingsClient = Setting.restRepository( client );
+		const settings = await settingsClient.list( settingsGroup );
+		if ( ! settings.length  ) {
+			return;
+		}
+
+		for ( let s = 0; s < settings.length; s++ ) {
+			// The rest api doesn't allow selects to be set to ''.
+			if ( settings[s].type == 'select' && settings[s].default == '' ) {
+				continue;
+			}
+			const defaultSetting = {
+				group_id: settingsGroup,
+				id: settings[s].id,
+				value: settings[s].default,
+			};
+
+			const response = await settingsClient.update( settingsGroup, defaultSetting.id, defaultSetting );
+			// Multi-selects have a default '' but return an empty [].
+			if ( settings[s].type != 'multiselect' ) {
+				expect( response.value ).toBe( defaultSetting.value );
+			}
+		}
+	}
+};
diff --git a/tests/e2e/utils/src/page-utils.js b/tests/e2e/utils/src/page-utils.js
index 4bf9024989e..bafd685287e 100644
--- a/tests/e2e/utils/src/page-utils.js
+++ b/tests/e2e/utils/src/page-utils.js
@@ -9,7 +9,7 @@ import { pressKeyWithModifier } from '@wordpress/e2e-test-utils';
  * @param {string} selector
  * @param {string} value
  */
-const clearAndFillInput = async ( selector, value ) => {
+export const clearAndFillInput = async ( selector, value ) => {
 	await page.waitForSelector( selector );
 	await page.focus( selector );
 	await pressKeyWithModifier( 'primary', 'a' );
@@ -21,14 +21,14 @@ const clearAndFillInput = async ( selector, value ) => {
  *
  * @param {string} tabName Tab label
  */
-const clickTab = async ( tabName ) => {
+export const clickTab = async ( tabName ) => {
 	await expect( page ).toClick( '.wc-tabs > li > a', { text: tabName } );
 };
 
 /**
  * Save changes on a WooCommerce settings page.
  */
-const settingsPageSaveChanges = async () => {
+export const settingsPageSaveChanges = async () => {
 	await page.focus( 'button.woocommerce-save-button' );
 	await Promise.all( [
 		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
@@ -39,7 +39,7 @@ const settingsPageSaveChanges = async () => {
 /**
  * Save changes on Permalink settings page.
  */
-const permalinkSettingsPageSaveChanges = async () => {
+export const permalinkSettingsPageSaveChanges = async () => {
 	await page.focus( '.wp-core-ui .button-primary' );
 	await Promise.all( [
 		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
@@ -52,7 +52,7 @@ const permalinkSettingsPageSaveChanges = async () => {
  *
  * @param {string} selector
  */
-const setCheckbox = async( selector ) => {
+export const setCheckbox = async( selector ) => {
 	await page.focus( selector );
 	const checkbox = await page.$( selector );
 	const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
@@ -66,7 +66,7 @@ const setCheckbox = async( selector ) => {
  *
  * @param {string} selector
  */
-const unsetCheckbox = async( selector ) => {
+export const unsetCheckbox = async( selector ) => {
 	await page.focus( selector );
 	const checkbox = await page.$( selector );
 	const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
@@ -78,10 +78,36 @@ const unsetCheckbox = async( selector ) => {
 /**
  * Wait for UI blocking to end.
  */
-const uiUnblocked = async () => {
+export const uiUnblocked = async () => {
 	await page.waitForFunction( () => ! Boolean( document.querySelector( '.blockUI' ) ) );
 };
 
+/**
+ * Wait for backbone blocking to end.
+ */
+export const backboneUnblocked = async () => {
+	await page.waitForFunction( () => ! Boolean( document.querySelector( '.wc-backbone-modal' ) ) );
+};
+
+/**
+ * Conditionally wait for a selector without throwing an error.
+ *
+ * @param selector
+ * @param timeoutInSeconds
+ * @returns {Promise<boolean>}
+ */
+export const waitForSelectorWithoutThrow = async ( selector, timeoutInSeconds = 5 ) => {
+	let selected = await page.$( selector );
+	for ( let s = 0; s < timeoutInSeconds; s++ ) {
+		if ( selected ) {
+			break;
+		}
+		await page.waitFor( 1000 );
+		selected = await page.$( selector );
+	}
+	return Boolean( selected );
+};
+
 /**
  * Publish, verify that item was published. Trash, verify that item was trashed.
  *
@@ -90,7 +116,7 @@ const uiUnblocked = async () => {
  * @param {string} publishVerification
  * @param {string} trashVerification
  */
-const verifyPublishAndTrash = async ( button, publishNotice, publishVerification, trashVerification ) => {
+export const verifyPublishAndTrash = async ( button, publishNotice, publishVerification, trashVerification ) => {
 	// Wait for auto save
 	await page.waitFor( 2000 );
 
@@ -124,7 +150,7 @@ const verifyPublishAndTrash = async ( button, publishNotice, publishVerification
  *
  * @param {string} selector Selector of the checkbox that needs to be verified.
  */
-const verifyCheckboxIsSet = async( selector ) => {
+export const verifyCheckboxIsSet = async( selector ) => {
 	await page.focus( selector );
 	const checkbox = await page.$( selector );
 	const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
@@ -136,7 +162,7 @@ const verifyCheckboxIsSet = async( selector ) => {
  *
  * @param {string} selector Selector of the checkbox that needs to be verified.
  */
-const verifyCheckboxIsUnset = async( selector ) => {
+export const verifyCheckboxIsUnset = async( selector ) => {
 	await page.focus( selector );
 	const checkbox = await page.$( selector );
 	const checkboxStatus = ( await ( await checkbox.getProperty( 'checked' ) ).jsonValue() );
@@ -149,7 +175,7 @@ const verifyCheckboxIsUnset = async( selector ) => {
  * @param {string} selector Selector of the input field that needs to be verified.
  * @param {string} value Value of the input field that needs to be verified.
  */
-const verifyValueOfInputField = async( selector, value ) => {
+export const verifyValueOfInputField = async( selector, value ) => {
 	await page.focus( selector );
 	const field = await page.$( selector );
 	const fieldValue = ( await ( await field.getProperty( 'value' ) ).jsonValue() );
@@ -161,7 +187,7 @@ const verifyValueOfInputField = async( selector, value ) => {
  *
  * @param {string} selector Selector of the filter link to be clicked.
  */
-const clickFilter = async ( selector ) => {
+export const clickFilter = async ( selector ) => {
 	await page.waitForSelector( selector );
 	await page.focus( selector );
 	await Promise.all( [
@@ -175,7 +201,7 @@ const clickFilter = async ( selector ) => {
  *
  * If there's more than 20 items, it moves all 20 items on the current page.
  */
-const moveAllItemsToTrash = async () => {
+export const moveAllItemsToTrash = async () => {
 	await setCheckbox( '#cb-select-all-1' );
 	await expect( page ).toSelect( '#bulk-action-selector-top', 'Move to Trash' );
 	await Promise.all( [
@@ -191,7 +217,7 @@ const moveAllItemsToTrash = async () => {
  *
  * @param {string} selector Selector of the filter link to be clicked.
  */
-const evalAndClick = async ( selector ) => {
+export const evalAndClick = async ( selector ) => {
 	// We use this when `expect(page).toClick()` is unable to find the element
 	// See: https://github.com/puppeteer/puppeteer/issues/1769#issuecomment-637645219
 	page.$eval( selector, elem => elem.click() );
@@ -203,7 +229,7 @@ const evalAndClick = async ( selector ) => {
  * @param {string} value Value of what to be selected
  * @param {string} selector Selector of the select2 search field
  */
-const selectOptionInSelect2 = async ( value, selector = 'input.select2-search__field' ) => {
+export const selectOptionInSelect2 = async ( value, selector = 'input.select2-search__field' ) => {
 	await page.waitForSelector(selector);
 	await page.click(selector);
 	await page.type(selector, value);
@@ -218,12 +244,11 @@ const selectOptionInSelect2 = async ( value, selector = 'input.select2-search__f
  * @param {string} orderId Order ID
  * @param {string} customerName Customer's full name attached to order ID.
  */
-const searchForOrder = async (value, orderId, customerName) => {
+export const searchForOrder = async (value, orderId, customerName) => {
 	await clearAndFillInput('#post-search-input', value);
 	await expect(page).toMatchElement('#post-search-input', value);
-	await expect(page).toClick('#search-submit');
-	await page.waitForSelector('#the-list');
-	await page.waitFor(1000);
+	await expect(page).toClick('#search-submit' );
+	await page.waitForSelector('#the-list', { timeout: 10000 } );
 	await expect(page).toMatchElement('.order_number > a.order-view', {text: `#${orderId} ${customerName}`});
 };
 
@@ -234,8 +259,12 @@ const searchForOrder = async (value, orderId, customerName) => {
  * @param couponCode string
  * @returns {Promise<void>}
  */
-const applyCoupon = async ( couponCode ) => {
+export const applyCoupon = async ( couponCode ) => {
 	try {
+		await Promise.all([
+			page.reload(),
+			page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+		]);
 		await expect(page).toClick('a', {text: 'Click here to enter your code'});
 		await uiUnblocked();
 		await clearAndFillInput('#coupon_code', couponCode);
@@ -254,7 +283,11 @@ const applyCoupon = async ( couponCode ) => {
  * @param couponCode Coupon name.
  * @returns {Promise<void>}
  */
-const removeCoupon = async ( couponCode ) => {
+export const removeCoupon = async ( couponCode ) => {
+	await Promise.all([
+		page.reload(),
+		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+	]);
 	await expect(page).toClick('[data-coupon="'+couponCode.toLowerCase()+'"]', {text: '[Remove]'});
 	await uiUnblocked();
 	await expect(page).toMatchElement('.woocommerce-message', {text: 'Coupon has been removed.'});
@@ -266,32 +299,10 @@ const removeCoupon = async ( couponCode ) => {
  *
  * @param {string} action The action to take on the order.
  */
-const selectOrderAction = async ( action ) => {
+export const selectOrderAction = async ( action ) => {
 	await page.select( 'select[name=wc_order_action]', action );
 	await Promise.all( [
 		page.click( '.wc-reload' ),
 		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
 	] );
 }
-
-export {
-	clearAndFillInput,
-	clickTab,
-	settingsPageSaveChanges,
-	permalinkSettingsPageSaveChanges,
-	setCheckbox,
-	unsetCheckbox,
-	uiUnblocked,
-	verifyPublishAndTrash,
-	verifyCheckboxIsSet,
-	verifyCheckboxIsUnset,
-	verifyValueOfInputField,
-	clickFilter,
-	moveAllItemsToTrash,
-	evalAndClick,
-	selectOptionInSelect2,
-	searchForOrder,
-	applyCoupon,
-	removeCoupon,
-	selectOrderAction,
-};
diff --git a/tests/legacy/bootstrap.php b/tests/legacy/bootstrap.php
index bfbcd11edeb..62d93d87254 100644
--- a/tests/legacy/bootstrap.php
+++ b/tests/legacy/bootstrap.php
@@ -103,7 +103,14 @@ class WC_Unit_Tests_Bootstrap {
 	 * @throws Exception Error when initializing one of the hacks.
 	 */
 	private function initialize_code_hacker() {
-		CodeHacker::initialize( array( __DIR__ . '/../../includes/' ) );
+		$wp_dir = getenv( 'WP_TESTS_WP_DIR' ) ? getenv( 'WP_TESTS_WP_DIR' ) : sys_get_temp_dir() . '/wordpress';
+		CodeHacker::initialize(
+			array(
+				$this->plugin_dir . '/includes/',
+				$wp_dir . '/wp-includes/class-wp-customize-manager.php',
+			)
+		);
+
 		$replaceable_functions = include_once __DIR__ . '/mockable-functions.php';
 		if ( ! empty( $replaceable_functions ) ) {
 			FunctionsMockerHack::initialize( $replaceable_functions );
diff --git a/tests/legacy/framework/class-wc-unit-test-case.php b/tests/legacy/framework/class-wc-unit-test-case.php
index 74289f2b413..c3255481fef 100644
--- a/tests/legacy/framework/class-wc-unit-test-case.php
+++ b/tests/legacy/framework/class-wc-unit-test-case.php
@@ -7,6 +7,7 @@
 
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 use Automattic\WooCommerce\Testing\Tools\CodeHacking\CodeHacker;
+use PHPUnit\Framework\Constraint\IsType;
 
 /**
  * WC Unit Test Case.
@@ -246,4 +247,16 @@ class WC_Unit_Test_Case extends WP_HTTP_TestCase {
 	public function register_legacy_proxy_class_mocks( array $mocks ) {
 		wc_get_container()->get( LegacyProxy::class )->register_class_mocks( $mocks );
 	}
+
+	/**
+	 * Asserts that a variable is of type int.
+	 * TODO: After upgrading to PHPUnit 8 or newer, remove this method and replace calls with PHPUnit's built-in 'assertIsInt'.
+	 *
+	 * @param mixed $actual The value to check.
+	 * @param mixed $message Error message to use if the assertion fails.
+	 * @return bool mixed True if the value is of integer type, false otherwise.
+	 */
+	public static function assertIsInteger( $actual, $message = '' ) {
+		return self::assertInternalType( 'int', $actual, $message );
+	}
 }
diff --git a/tests/legacy/framework/helpers/class-wc-helper-customer.php b/tests/legacy/framework/helpers/class-wc-helper-customer.php
index fe6b9ba644d..c814ac104d7 100644
--- a/tests/legacy/framework/helpers/class-wc-helper-customer.php
+++ b/tests/legacy/framework/helpers/class-wc-helper-customer.php
@@ -17,15 +17,15 @@ class WC_Helper_Customer {
 			'id'                  => 0,
 			'date_modified'       => null,
 			'country'             => 'US',
-			'state'               => 'PA',
-			'postcode'            => '19123',
-			'city'                => 'Philadelphia',
+			'state'               => 'CA',
+			'postcode'            => '94110',
+			'city'                => 'San Francisco',
 			'address'             => '123 South Street',
 			'address_2'           => 'Apt 1',
 			'shipping_country'    => 'US',
-			'shipping_state'      => 'PA',
-			'shipping_postcode'   => '19123',
-			'shipping_city'       => 'Philadelphia',
+			'shipping_state'      => 'CA',
+			'shipping_postcode'   => '94110',
+			'shipping_city'       => 'San Francisco',
 			'shipping_address'    => '123 South Street',
 			'shipping_address_2'  => 'Apt 1',
 			'is_vat_exempt'       => false,
@@ -46,15 +46,15 @@ class WC_Helper_Customer {
 		$customer = new WC_Customer();
 		$customer->set_billing_country( 'US' );
 		$customer->set_first_name( 'Justin' );
-		$customer->set_billing_state( 'PA' );
-		$customer->set_billing_postcode( '19123' );
-		$customer->set_billing_city( 'Philadelphia' );
+		$customer->set_billing_state( 'CA' );
+		$customer->set_billing_postcode( '94110' );
+		$customer->set_billing_city( 'San Francisco' );
 		$customer->set_billing_address( '123 South Street' );
 		$customer->set_billing_address_2( 'Apt 1' );
 		$customer->set_shipping_country( 'US' );
-		$customer->set_shipping_state( 'PA' );
-		$customer->set_shipping_postcode( '19123' );
-		$customer->set_shipping_city( 'Philadelphia' );
+		$customer->set_shipping_state( 'CA' );
+		$customer->set_shipping_postcode( '94110' );
+		$customer->set_shipping_city( 'San Francisco' );
 		$customer->set_shipping_address( '123 South Street' );
 		$customer->set_shipping_address_2( 'Apt 1' );
 		$customer->set_username( $username );
@@ -70,7 +70,7 @@ class WC_Helper_Customer {
 	 * @return array
 	 */
 	public static function get_expected_store_location() {
-		return array( 'GB', '', '', '' );
+		return array( 'US', 'CA', '', '' );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/account/functions.php b/tests/legacy/unit-tests/account/functions.php
index b9b5756b1c6..ca57ba3bf5e 100644
--- a/tests/legacy/unit-tests/account/functions.php
+++ b/tests/legacy/unit-tests/account/functions.php
@@ -179,7 +179,7 @@ class WC_Tests_Account_Functions extends WC_Unit_Test_Case {
 	public function test_wc_get_account_formatted_address() {
 		$customer = WC_Helper_Customer::create_customer();
 
-		$this->assertEquals( '123 South Street<br/>Apt 1<br/>Philadelphia, PA 19123<br/>United States (US)', wc_get_account_formatted_address( 'billing', $customer->get_id() ) );
+		$this->assertEquals( '123 South Street<br/>Apt 1<br/>San Francisco, CA 94110', wc_get_account_formatted_address( 'billing', $customer->get_id() ) );
 
 		$customer->delete( true );
 	}
diff --git a/tests/legacy/unit-tests/cart/cart.php b/tests/legacy/unit-tests/cart/cart.php
index 6895ba49e74..f59fbbb7a05 100644
--- a/tests/legacy/unit-tests/cart/cart.php
+++ b/tests/legacy/unit-tests/cart/cart.php
@@ -73,9 +73,8 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
 
 		$this->assertEquals( '13.58', WC()->cart->get_total( 'edit' ) );
 		$this->assertEquals( 0.66, WC()->cart->get_total_tax() );
-		$this->assertEquals( 4.17, WC()->cart->get_discount_total() );
-		$this->assertEquals( 0.83, WC()->cart->get_discount_tax() );
-
+		$this->assertEquals( 0.83, wc_format_decimal( WC()->cart->get_discount_tax(), 2 ) );
+		$this->assertEquals( 4.17, wc_format_decimal( WC()->cart->get_discount_total(), 2 ) );
 	}
 
 	/**
@@ -302,7 +301,7 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
 
 		WC()->cart->add_to_cart( $product->get_id(), 1 );
 		WC()->cart->calculate_totals();
-		$this->assertEquals( 599, WC()->cart->subtotal );
+		$this->assertEquals( 599, wc_format_decimal( WC()->cart->subtotal, wc_get_price_decimals() ) );
 		$this->assertEquals( 599, WC()->cart->total );
 	}
 
diff --git a/tests/legacy/unit-tests/countries/countries.php b/tests/legacy/unit-tests/countries/countries.php
index 73f41fbd55c..d2e6c0e76d4 100644
--- a/tests/legacy/unit-tests/countries/countries.php
+++ b/tests/legacy/unit-tests/countries/countries.php
@@ -5,6 +5,8 @@
  * @package WooCommerce\Tests\Countries
  */
 
+// phpcs:disable WordPress.Files.FileName
+
 /**
  * WC_Countries tests.
  */
@@ -178,7 +180,7 @@ class WC_Tests_Countries extends WC_Unit_Test_Case {
 		update_option( 'woocommerce_default_country', 'NO' );
 		$this->assertEquals( 'VAT', $countries->tax_or_vat() );
 
-		update_option( 'woocommerce_default_country', 'US' );
+		update_option( 'woocommerce_default_country', 'US:CA' );
 		$this->assertEquals( 'Tax', $countries->tax_or_vat() );
 	}
 
diff --git a/tests/legacy/unit-tests/customer/crud.php b/tests/legacy/unit-tests/customer/crud.php
index 41c801d6538..2b070bbc309 100644
--- a/tests/legacy/unit-tests/customer/crud.php
+++ b/tests/legacy/unit-tests/customer/crud.php
@@ -324,16 +324,16 @@ class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
 		update_option( 'woocommerce_tax_based_on', 'shipping' );
 		$taxable = $customer->get_taxable_address();
 		$this->assertEquals( 'US', $taxable[0] );
-		$this->assertEquals( 'PA', $taxable[1] );
+		$this->assertEquals( 'CA', $taxable[1] );
 		$this->assertEquals( '11111', $taxable[2] );
 		$this->assertEquals( 'Test', $taxable[3] );
 
 		update_option( 'woocommerce_tax_based_on', 'billing' );
 		$taxable = $customer->get_taxable_address();
 		$this->assertEquals( 'US', $taxable[0] );
-		$this->assertEquals( 'PA', $taxable[1] );
-		$this->assertEquals( '19123', $taxable[2] );
-		$this->assertEquals( 'Philadelphia', $taxable[3] );
+		$this->assertEquals( 'CA', $taxable[1] );
+		$this->assertEquals( '94110', $taxable[2] );
+		$this->assertEquals( 'San Francisco', $taxable[3] );
 
 		update_option( 'woocommerce_tax_based_on', 'base' );
 		$taxable = $customer->get_taxable_address();
@@ -431,7 +431,7 @@ class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
 	 */
 	public function test_customer_is_customer_outside_base() {
 		$customer = WC_Helper_Customer::create_customer();
-		$this->assertTrue( $customer->is_customer_outside_base() );
+		$this->assertFalse( $customer->is_customer_outside_base() );
 		update_option( 'woocommerce_tax_based_on', 'base' );
 		$customer->set_billing_address_to_base();
 		$this->assertFalse( $customer->is_customer_outside_base() );
@@ -444,9 +444,9 @@ class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
 	public function test_customer_sessions() {
 		$session = WC_Helper_Customer::create_mock_customer(); // set into session....
 
-		$this->assertEquals( '19123', $session->get_billing_postcode() );
+		$this->assertEquals( '94110', $session->get_billing_postcode() );
 		$this->assertEquals( '123 South Street', $session->get_billing_address() );
-		$this->assertEquals( 'Philadelphia', $session->get_billing_city() );
+		$this->assertEquals( 'San Francisco', $session->get_billing_city() );
 
 		$session->set_billing_address( '124 South Street' );
 		$session->save();
diff --git a/tests/legacy/unit-tests/customer/customer.php b/tests/legacy/unit-tests/customer/customer.php
index 05b093e102d..de73d7ccdaa 100644
--- a/tests/legacy/unit-tests/customer/customer.php
+++ b/tests/legacy/unit-tests/customer/customer.php
@@ -83,7 +83,7 @@ class WC_Tests_Customer extends WC_Unit_Test_Case {
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the customer's billing address.
 		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
 		WC_Helper_Customer::set_tax_based_on( 'billing' );
-		$this->assertEquals( $customer->is_customer_outside_base(), true );
+		$this->assertEquals( $customer->is_customer_outside_base(), false );
 
 		// Customer is going with the Free Shipping option, and the store calculates tax based on the store base location.
 		WC_Helper_Customer::set_chosen_shipping_methods( array( 'free_shipping' ) );
diff --git a/tests/legacy/unit-tests/formatting/functions.php b/tests/legacy/unit-tests/formatting/functions.php
index aa071eeb685..ae237dacf6e 100644
--- a/tests/legacy/unit-tests/formatting/functions.php
+++ b/tests/legacy/unit-tests/formatting/functions.php
@@ -593,32 +593,32 @@ class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
 	 */
 	public function test_wc_price() {
 		// Common prices.
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1.00</bdi></span>', wc_price( 1 ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1.10</bdi></span>', wc_price( 1.1 ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1.17</bdi></span>', wc_price( 1.17 ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1,111.17</bdi></span>', wc_price( 1111.17 ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</bdi></span>', wc_price( 0 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1.00</bdi></span>', wc_price( 1 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1.10</bdi></span>', wc_price( 1.1 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1.17</bdi></span>', wc_price( 1.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1,111.17</bdi></span>', wc_price( 1111.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>0.00</bdi></span>', wc_price( 0 ) );
 
 		// Different currency.
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1,111.17</bdi></span>', wc_price( 1111.17, array( 'currency' => 'USD' ) ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1,111.17</bdi></span>', wc_price( 1111.17, array( 'currency' => 'GBP' ) ) );
 
 		// Negative price.
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi>-<span class="woocommerce-Price-currencySymbol">&pound;</span>1.17</bdi></span>', wc_price( -1.17 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi>-<span class="woocommerce-Price-currencySymbol">&#36;</span>1.17</bdi></span>', wc_price( -1.17 ) );
 
 		// Bogus prices.
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</bdi></span>', wc_price( null ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</bdi></span>', wc_price( 'Q' ) );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>0.00</bdi></span>', wc_price( 'ಠ_ಠ' ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>0.00</bdi></span>', wc_price( null ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>0.00</bdi></span>', wc_price( 'Q' ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>0.00</bdi></span>', wc_price( 'ಠ_ಠ' ) );
 
 		// Trim zeros.
 		add_filter( 'woocommerce_price_trim_zeros', '__return_true' );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1</bdi></span>', wc_price( 1.00 ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1</bdi></span>', wc_price( 1.00 ) );
 		remove_filter( 'woocommerce_price_trim_zeros', '__return_true' );
 
 		// Ex tax label.
 		$calc_taxes = get_option( 'woocommerce_calc_taxes' );
 		update_option( 'woocommerce_calc_taxes', 'yes' );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>1,111.17</bdi></span> <small class="woocommerce-Price-taxLabel tax_label">(ex. VAT)</small>', wc_price( '1111.17', array( 'ex_tax_label' => true ) ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>1,111.17</bdi></span> <small class="woocommerce-Price-taxLabel tax_label">(ex. tax)</small>', wc_price( '1111.17', array( 'ex_tax_label' => true ) ) );
 		update_option( 'woocommerce_calc_taxes', $calc_taxes );
 	}
 
@@ -926,7 +926,7 @@ class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
 	 * @since 3.3.0
 	 */
 	public function test_wc_format_sale_price() {
-		$this->assertEquals( '<del><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>10.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>5.00</bdi></span></ins>', wc_format_sale_price( '10', '5' ) );
+		$this->assertEquals( '<del aria-hidden="true"><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>10.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>5.00</bdi></span></ins>', wc_format_sale_price( '10', '5' ) );
 	}
 
 	/**
@@ -935,7 +935,7 @@ class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
 	 * @since 3.3.0
 	 */
 	public function test_wc_format_price_range() {
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>10.00</bdi></span> &ndash; <span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>5.00</bdi></span>', wc_format_price_range( '10', '5' ) );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>10.00</bdi></span> &ndash; <span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>5.00</bdi></span>', wc_format_price_range( '10', '5' ) );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/order/class-wc-tests-crud-orders.php b/tests/legacy/unit-tests/order/class-wc-tests-crud-orders.php
index 190f4257c19..2444987f2ae 100644
--- a/tests/legacy/unit-tests/order/class-wc-tests-crud-orders.php
+++ b/tests/legacy/unit-tests/order/class-wc-tests-crud-orders.php
@@ -1245,7 +1245,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$order->set_billing_country( 'US' );
 		$order->set_billing_city( 'Portland' );
 		$order->set_billing_postcode( '97266' );
-		$this->assertEquals( '123 Test St.<br/>Portland, 97266<br/>United States (US)', $order->get_formatted_billing_address( 'none' ) );
+		$this->assertEquals( '123 Test St.<br/>Portland, 97266', $order->get_formatted_billing_address( 'none' ) );
 
 		$this->assertTrue( $order->has_billing_address() );
 		$this->assertFalse( $order->has_shipping_address() );
@@ -1265,7 +1265,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$order->set_shipping_country( 'US' );
 		$order->set_shipping_city( 'Portland' );
 		$order->set_shipping_postcode( '97266' );
-		$this->assertEquals( '123 Test St.<br/>Portland, 97266<br/>United States (US)', $order->get_formatted_shipping_address( 'none' ) );
+		$this->assertEquals( '123 Test St.<br/>Portland, 97266', $order->get_formatted_shipping_address( 'none' ) );
 
 		$this->assertFalse( $order->has_billing_address() );
 		$this->assertTrue( $order->has_shipping_address() );
@@ -1498,7 +1498,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->set_billing_state( 'Boulder' );
 		$object->set_billing_postcode( '00001' );
 		$object->set_billing_country( 'US' );
-		$this->assertEquals( 'Fred Flintstone<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001<br/>United States (US)', $object->get_formatted_billing_address() );
+		$this->assertEquals( 'Fred Flintstone<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001', $object->get_formatted_billing_address() );
 	}
 
 	/**
@@ -1515,7 +1515,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->set_shipping_state( 'Boulder' );
 		$object->set_shipping_postcode( '00001' );
 		$object->set_shipping_country( 'US' );
-		$this->assertEquals( 'Barney Rubble<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001<br/>United States (US)', $object->get_formatted_shipping_address() );
+		$this->assertEquals( 'Barney Rubble<br/>Bedrock Ltd.<br/>34 Stonepants avenue<br/>Rockville<br/>Bedrock, BOULDER 00001', $object->get_formatted_shipping_address() );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/privacy/export.php b/tests/legacy/unit-tests/privacy/export.php
index 0d8db0ee39e..68d8b7fe85a 100644
--- a/tests/legacy/unit-tests/privacy/export.php
+++ b/tests/legacy/unit-tests/privacy/export.php
@@ -86,15 +86,15 @@ class WC_Test_Privacy_Export extends WC_Unit_Test_Case {
 						),
 						array(
 							'name'  => 'Billing City',
-							'value' => 'Philadelphia',
+							'value' => 'San Francisco',
 						),
 						array(
 							'name'  => 'Billing Postal/Zip Code',
-							'value' => '19123',
+							'value' => '94110',
 						),
 						array(
 							'name'  => 'Billing State',
-							'value' => 'PA',
+							'value' => 'CA',
 						),
 						array(
 							'name'  => 'Billing Country / Region',
@@ -114,15 +114,15 @@ class WC_Test_Privacy_Export extends WC_Unit_Test_Case {
 						),
 						array(
 							'name'  => 'Shipping City',
-							'value' => 'Philadelphia',
+							'value' => 'San Francisco',
 						),
 						array(
 							'name'  => 'Shipping Postal/Zip Code',
-							'value' => '19123',
+							'value' => '94110',
 						),
 						array(
 							'name'  => 'Shipping State',
-							'value' => 'PA',
+							'value' => 'CA',
 						),
 						array(
 							'name'  => 'Shipping Country / Region',
diff --git a/tests/legacy/unit-tests/product/data.php b/tests/legacy/unit-tests/product/data.php
index bcc5bd583fc..09c5f78ea57 100644
--- a/tests/legacy/unit-tests/product/data.php
+++ b/tests/legacy/unit-tests/product/data.php
@@ -259,15 +259,15 @@ class WC_Tests_Product_Data extends WC_Unit_Test_Case {
 
 		$product = wc_get_product( $product1_id );
 		$this->assertEquals( $product1_id, $product->get_id() );
-		$this->assertEquals( '<del><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>10.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>7.00</bdi></span></ins>', $product->get_price_html() );
+		$this->assertEquals( '<del aria-hidden="true"><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>10.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>7.00</bdi></span></ins>', $product->get_price_html() );
 
 		$product = wc_get_product( $product2_id );
 		$this->assertEquals( $product2_id, $product->get_id() );
-		$this->assertEquals( '<del><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>20.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>16.00</bdi></span></ins>', $product->get_price_html() );
+		$this->assertEquals( '<del aria-hidden="true"><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>20.00</bdi></span></del> <ins><span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>16.00</bdi></span></ins>', $product->get_price_html() );
 
 		$product = wc_get_product( $product3_id );
 		$this->assertEquals( $product3_id, $product->get_id() );
-		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&pound;</span>50.00</bdi></span>', $product->get_price_html() );
+		$this->assertEquals( '<span class="woocommerce-Price-amount amount"><bdi><span class="woocommerce-Price-currencySymbol">&#36;</span>50.00</bdi></span>', $product->get_price_html() );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/rest-api/Helpers/CustomerHelper.php b/tests/legacy/unit-tests/rest-api/Helpers/CustomerHelper.php
index 5751cf31f32..2dfcbdbb4e6 100644
--- a/tests/legacy/unit-tests/rest-api/Helpers/CustomerHelper.php
+++ b/tests/legacy/unit-tests/rest-api/Helpers/CustomerHelper.php
@@ -26,15 +26,15 @@ class CustomerHelper {
 			'id'                  => 0,
 			'date_modified'       => null,
 			'country'             => 'US',
-			'state'               => 'PA',
-			'postcode'            => '19123',
-			'city'                => 'Philadelphia',
+			'state'               => 'CA',
+			'postcode'            => '94110',
+			'city'                => 'San Francisco',
 			'address'             => '123 South Street',
 			'address_2'           => 'Apt 1',
 			'shipping_country'    => 'US',
-			'shipping_state'      => 'PA',
-			'shipping_postcode'   => '19123',
-			'shipping_city'       => 'Philadelphia',
+			'shipping_state'      => 'CA',
+			'shipping_postcode'   => '94110',
+			'shipping_city'       => 'San Francisco',
 			'shipping_address'    => '123 South Street',
 			'shipping_address_2'  => 'Apt 1',
 			'is_vat_exempt'       => false,
@@ -55,15 +55,15 @@ class CustomerHelper {
 		$customer = new WC_Customer();
 		$customer->set_billing_country( 'US' );
 		$customer->set_first_name( 'Justin' );
-		$customer->set_billing_state( 'PA' );
-		$customer->set_billing_postcode( '19123' );
-		$customer->set_billing_city( 'Philadelphia' );
+		$customer->set_billing_state( 'CA' );
+		$customer->set_billing_postcode( '94110' );
+		$customer->set_billing_city( 'San Francisco' );
 		$customer->set_billing_address( '123 South Street' );
 		$customer->set_billing_address_2( 'Apt 1' );
 		$customer->set_shipping_country( 'US' );
-		$customer->set_shipping_state( 'PA' );
-		$customer->set_shipping_postcode( '19123' );
-		$customer->set_shipping_city( 'Philadelphia' );
+		$customer->set_shipping_state( 'CA' );
+		$customer->set_shipping_postcode( '94110' );
+		$customer->set_shipping_city( 'San Francisco' );
 		$customer->set_shipping_address( '123 South Street' );
 		$customer->set_shipping_address_2( 'Apt 1' );
 		$customer->set_username( $username );
@@ -79,7 +79,7 @@ class CustomerHelper {
 	 * @return array
 	 */
 	public static function get_expected_store_location() {
-		return array( 'GB', '', '', '' );
+		return array( 'US', 'CA', '', '' );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version2/customers.php b/tests/legacy/unit-tests/rest-api/Tests/Version2/customers.php
index f9a4d5acca1..cebf6cdad9c 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version2/customers.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version2/customers.php
@@ -70,9 +70,9 @@ class Customers_V2 extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 					'email'      => '',
 					'phone'      => '',
@@ -83,9 +83,9 @@ class Customers_V2 extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 				),
 				'is_paying_customer' => false,
@@ -315,9 +315,9 @@ class Customers_V2 extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 					'email'      => '',
 					'phone'      => '',
@@ -328,9 +328,9 @@ class Customers_V2 extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 				),
 				'is_paying_customer' => false,
diff --git a/tests/legacy/unit-tests/rest-api/Tests/Version3/customers.php b/tests/legacy/unit-tests/rest-api/Tests/Version3/customers.php
index 8d4508bade4..15e02ae4c9b 100644
--- a/tests/legacy/unit-tests/rest-api/Tests/Version3/customers.php
+++ b/tests/legacy/unit-tests/rest-api/Tests/Version3/customers.php
@@ -77,9 +77,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 					'email'      => '',
 					'phone'      => '',
@@ -90,9 +90,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 				),
 				'is_paying_customer' => false,
@@ -147,9 +147,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 					'email'      => '',
 					'phone'      => '',
@@ -160,9 +160,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 				),
 				'is_paying_customer' => false,
@@ -387,9 +387,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 					'email'      => '',
 					'phone'      => '',
@@ -400,9 +400,9 @@ class Customers extends WC_REST_Unit_Test_Case {
 					'company'    => '',
 					'address_1'  => '123 South Street',
 					'address_2'  => 'Apt 1',
-					'city'       => 'Philadelphia',
-					'state'      => 'PA',
-					'postcode'   => '19123',
+					'city'       => 'San Francisco',
+					'state'      => 'CA',
+					'postcode'   => '94110',
 					'country'    => 'US',
 				),
 				'is_paying_customer' => false,
diff --git a/tests/legacy/unit-tests/tax/tax.php b/tests/legacy/unit-tests/tax/tax.php
index 9269f766526..8862aa848cd 100644
--- a/tests/legacy/unit-tests/tax/tax.php
+++ b/tests/legacy/unit-tests/tax/tax.php
@@ -117,8 +117,8 @@ class WC_Tests_Tax extends WC_Unit_Test_Case {
 	 */
 	public function test_get_base_tax_rates() {
 		$tax_rate = array(
-			'tax_rate_country'  => 'GB',
-			'tax_rate_state'    => '',
+			'tax_rate_country'  => 'US',
+			'tax_rate_state'    => 'CA',
 			'tax_rate'          => '20.0000',
 			'tax_rate_name'     => 'VAT',
 			'tax_rate_priority' => '1',
diff --git a/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php b/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
index a782089e51b..6f2c17b7d5e 100644
--- a/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
+++ b/tests/legacy/unit-tests/util/class-wc-tests-core-functions.php
@@ -30,7 +30,7 @@ class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
 	 */
 	public function test_get_woocommerce_currency() {
 
-		$this->assertEquals( 'GBP', get_woocommerce_currency() );
+		$this->assertEquals( 'USD', get_woocommerce_currency() );
 	}
 
 	/**
@@ -222,10 +222,10 @@ class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
 	public function test_get_woocommerce_currency_symbol() {
 
 		// Default currency.
-		$this->assertEquals( '&pound;', get_woocommerce_currency_symbol() );
+		$this->assertEquals( '&#36;', get_woocommerce_currency_symbol() );
 
 		// Given specific currency.
-		$this->assertEquals( '&#36;', get_woocommerce_currency_symbol( 'USD' ) );
+		$this->assertEquals( '&pound;', get_woocommerce_currency_symbol( 'GBP' ) );
 
 		// Each case.
 		foreach ( array_keys( get_woocommerce_currencies() ) as $currency_code ) {
@@ -348,8 +348,8 @@ class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
 	public function test_wc_get_base_location() {
 		$default = wc_get_base_location();
 
-		$this->assertEquals( 'GB', $default['country'] );
-		$this->assertEquals( '', $default['state'] );
+		$this->assertEquals( 'US', $default['country'] );
+		$this->assertEquals( 'CA', $default['state'] );
 	}
 
 	/**
diff --git a/tests/legacy/unit-tests/util/deprecated-hooks.php b/tests/legacy/unit-tests/util/deprecated-hooks.php
index 8867fe90bb3..6d93a50942d 100644
--- a/tests/legacy/unit-tests/util/deprecated-hooks.php
+++ b/tests/legacy/unit-tests/util/deprecated-hooks.php
@@ -1,44 +1,58 @@
 <?php
-
 /**
  * Classes WC_Deprecated_Filter_Hooks & WC_Deprecated_Action_Hooks.
  * @package WooCommerce\Tests\Util
  * @since 3.0
  */
+
+/**
+ * Class WC_Tests_Deprecated_Hooks.
+ */
 class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 
+	/**
+	 * @var array Deprecated hook handlers.
+	 */
 	protected $handlers = array();
 
 	/**
 	 * Generic toggle value function that can be hooked to a filter for testing.
-	 * @param bool/int $value
-	 * @return bool/int
+	 *
+	 * @param bool/int $value Value to change.
+	 *
+	 * @return bool/int Changed value.
 	 */
-	function toggle_value( $value ) {
+	public function toggle_value( $value ) {
 		return ! $value;
 	}
 
 	/**
 	 * Generic toggle value function that can be hooked to an action for testing.
-	 * @param bool/int $value
+	 *
+	 * @param bool/int $value Value to change.
 	 */
-	function toggle_value_by_ref( &$value ) {
+	public function toggle_value_by_ref( &$value ) {
 		$value = ! $value;
 	}
 
 	/**
 	 * Generic meta setting function that can be hooked to an action for testing.
-	 * @param int $item1_id
-	 * @param int $item2_id (default: false)
+	 *
+	 * @param int $item1_id Post ID.
+	 * @param int $item2_id Post ID.
 	 */
-	function set_meta( $item1_id, $item2_id = false ) {
+	public function set_meta( $item1_id, $item2_id = false ) {
 		update_post_meta( $item1_id, 'wc_deprecated_hook_test_item1_meta', 1 );
 		if ( $item2_id ) {
 			update_post_meta( $item2_id, 'wc_deprecated_hook_test_item2_meta', 2 );
 		}
 	}
 
-	function setUp() {
+	/**
+	 * Disable deprecation error trigger for this class.
+	 */
+	public function setUp() {
+		parent::setUp();
 		add_filter( 'deprecated_function_trigger_error', '__return_false' );
 		add_filter( 'deprecated_hook_trigger_error', '__return_false' );
 		$this->handlers = WC()->deprecated_hook_handlers;
@@ -49,7 +63,7 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_deprecated_hook_handlers_exist() {
+	public function test_deprecated_hook_handlers_exist() {
 		$this->assertArrayHasKey( 'filters', $this->handlers );
 		$this->assertInstanceOf( 'WC_Deprecated_Filter_Hooks', $this->handlers['filters'] );
 
@@ -62,7 +76,7 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_get_old_hooks() {
+	public function test_get_old_hooks() {
 		$old_filters = $this->handlers['filters']->get_old_hooks( 'woocommerce_structured_data_order' );
 		$old_actions = $this->handlers['actions']->get_old_hooks( 'woocommerce_new_order_item' );
 
@@ -75,7 +89,7 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_hook_in() {
+	public function test_hook_in() {
 		$this->assertTrue( (bool) has_filter( 'woocommerce_structured_data_order', array( $this->handlers['filters'], 'maybe_handle_deprecated_hook' ) ) );
 		$this->assertTrue( (bool) has_action( 'woocommerce_new_order_item', array( $this->handlers['actions'], 'maybe_handle_deprecated_hook' ) ) );
 	}
@@ -85,12 +99,13 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_handle_deprecated_hook_filter() {
+	public function test_handle_deprecated_hook_filter() {
 		$new_hook = 'wc_new_hook';
 		$old_hook = 'wc_old_hook';
 		$args     = array( false );
 		$return   = -1;
 
+		$this->setExpectedDeprecated( 'wc_old_hook' );
 		add_filter( $old_hook, array( $this, 'toggle_value' ) );
 
 		$result = $this->handlers['filters']->handle_deprecated_hook( $new_hook, $old_hook, $args, $return );
@@ -102,13 +117,14 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_handle_deprecated_hook_action() {
+	public function test_handle_deprecated_hook_action() {
 		$new_hook   = 'wc_new_hook';
 		$old_hook   = 'wc_old_hook';
 		$test_value = false;
 		$args       = array( &$test_value );
 		$return     = -1;
 
+		$this->setExpectedDeprecated( 'wc_old_hook' );
 		add_filter( $old_hook, array( $this, 'toggle_value_by_ref' ) );
 
 		$this->handlers['actions']->handle_deprecated_hook( $new_hook, $old_hook, $args, $return );
@@ -120,9 +136,10 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_filter_handler() {
+	public function test_filter_handler() {
 		$test_width = 1;
 
+		$this->setExpectedDeprecated( 'woocommerce_product_width' );
 		add_filter( 'woocommerce_product_width', array( $this, 'toggle_value' ) );
 
 		$new_width = apply_filters( 'woocommerce_product_get_width', $test_width );
@@ -134,7 +151,7 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_action_handler() {
+	public function test_action_handler() {
 		$test_product  = WC_Helper_Product::create_simple_product();
 		$test_order    = WC_Helper_Order::create_order( 1, $test_product );
 		$test_order_id = $test_order->get_id();
@@ -142,6 +159,7 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 		$test_item     = reset( $test_items );
 		$test_item_id  = $test_item->get_id();
 
+		$this->setExpectedDeprecated( 'woocommerce_order_edit_product' );
 		add_action( 'woocommerce_order_edit_product', array( $this, 'set_meta' ), 10, 2 );
 		do_action( 'woocommerce_update_order_item', $test_item_id, $test_item, $test_order_id );
 
@@ -157,10 +175,13 @@ class WC_Tests_Deprecated_Hooks extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.0
 	 */
-	function test_created_actions_deprecation() {
+	public function test_created_actions_deprecation() {
 		add_filter( 'woocommerce_payment_token_created', '__return_true' );
 		add_filter( 'woocommerce_create_product_variation', '__return_true' );
 
+		$this->setExpectedDeprecated( 'woocommerce_payment_token_created' );
+		$this->setExpectedDeprecated( 'woocommerce_create_product_variation' );
+
 		$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
 		$token->save();
 
diff --git a/tests/php/includes/class-wc-cart-totals-test.php b/tests/php/includes/class-wc-cart-totals-test.php
new file mode 100644
index 00000000000..bb292273ac5
--- /dev/null
+++ b/tests/php/includes/class-wc-cart-totals-test.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * Class WC_Cart_Totals_Tests. Tests for WC_Cart_Total class.
+ */
+class WC_Cart_Totals_Tests extends WC_Unit_Test_Case {
+
+	/**
+	 * Tests whether discount tax is rounded properly in cart.
+	 *
+	 * @link https://github.com/woocommerce/woocommerce/issues/23916.
+	 */
+	public function test_discount_tax_rounding() {
+		update_option( 'woocommerce_prices_include_tax', 'yes' );
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+
+		WC()->cart->empty_cart();
+
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '27.0000',
+			'tax_rate_name'     => 'TAX27',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '0',
+			'tax_rate_order'    => '1',
+		);
+
+		WC_Tax::_insert_tax_rate( $tax_rate );
+		$product_240  = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 240 ) );
+		$product_1250 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 1250 ) );
+		$product_1990 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 1990 ) );
+		$product_3390 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 3390 ) );
+		$product_6200 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 6200 ) );
+		$coupon = WC_Helper_Coupon::create_coupon( 'flat2000', array( 'coupon_amount' => 2000 ) );
+
+		WC()->cart->add_to_cart( $product_240->get_id(), 1 );
+		WC()->cart->add_to_cart( $product_1250->get_id(), 1 );
+		WC()->cart->add_to_cart( $product_1990->get_id(), 1 );
+		WC()->cart->add_to_cart( $product_3390->get_id(), 1 );
+		WC()->cart->add_to_cart( $product_6200->get_id(), 1 );
+		WC()->cart->apply_coupon( $coupon->get_code() );
+
+		$this->assert_discount_tax_rounding_when_rounding_at_subtotal();
+		$this->assert_discount_tax_rounding_when_rounding_at_line();
+	}
+
+	/**
+	 * Helper method for assertions when prices are rounded at line.
+	 */
+	private function assert_discount_tax_rounding_when_rounding_at_line() {
+		update_option( 'woocommerce_tax_round_at_subtotal', 'no' );
+		$decimal_precision = wc_get_price_decimals();
+		update_option( 'woocommerce_price_num_decimals', 0 );
+
+		WC()->cart->calculate_totals();
+		update_option( 'woocommerce_price_num_decimals', $decimal_precision );
+
+		$this->assertEquals( '1575', wc_format_decimal( WC()->cart->get_discount_total(), 0 ) );
+		$this->assertEquals( '425', wc_format_decimal( WC()->cart->get_discount_tax(), 0 ) );
+		$this->assertEquals( '11070', wc_format_decimal( WC()->cart->get_total( 'edit' ), 0 ) );
+	}
+
+	/**
+	 * Helper method for assertions when prices are rounded at line.
+	 */
+	private function assert_discount_tax_rounding_when_rounding_at_subtotal() {
+		update_option( 'woocommerce_tax_round_at_subtotal', 'yes' );
+		$decimal_precision = wc_get_price_decimals();
+		update_option( 'woocommerce_price_num_decimals', 0 );
+
+		WC()->cart->calculate_totals();
+		update_option( 'woocommerce_price_num_decimals', $decimal_precision );
+
+		$this->assertEquals( '1575', wc_format_decimal( WC()->cart->get_discount_total(), 0 ) );
+		$this->assertEquals( '425', wc_format_decimal( WC()->cart->get_discount_tax(), 0 ) );
+		$this->assertEquals( '11070', wc_format_decimal( WC()->cart->get_total( 'edit' ), 0 ) );
+	}
+
+	/**
+	 * Tests whether subtotal is properly rounded, when prices entered have higher precision than displayed.
+	 *
+	 * @link https://github.com/woocommerce/woocommerce/issues/28292.
+	 */
+	public function test_subtotal_rounding_with_changing_precision() {
+		update_option( 'woocommerce_prices_include_tax', 'yes' );
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		update_option( 'woocommerce_tax_round_at_subtotal', 'yes' );
+		$decimal_precision = wc_get_price_decimals();
+		update_option( 'woocommerce_price_num_decimals', 0 );
+
+		WC()->cart->empty_cart();
+
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '23.0000',
+			'tax_rate_name'     => 'TAX23',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '0',
+			'tax_rate_order'    => '1',
+		);
+
+		WC_Tax::_insert_tax_rate( $tax_rate );
+		$product_301_90909 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 301.90909 ) );
+
+		WC()->cart->add_to_cart( $product_301_90909->get_id() );
+		WC()->cart->calculate_totals();
+		update_option( 'woocommerce_price_num_decimals', $decimal_precision );
+
+		// Notice how subtotal + tax does not equate to total here.
+		// This is feature of round at subtotal property, where since we are not rounding, displayed components of price may not add up to displayed total price.
+		$this->assertEquals( '245', wc_format_decimal( WC()->cart->get_subtotal(), 0 ) );
+		$this->assertEquals( '302', wc_format_decimal( WC()->cart->get_total( 'edit' ), 0 ) );
+		$this->assertEquals( '56', wc_format_decimal( WC()->cart->get_total_tax(), 0 ) );
+	}
+
+	/**
+	 * Test subtotal and total are rounded correctly when values are entered with more precision.
+	 *
+	 * @link https://github.com/woocommerce/woocommerce/issues/24184#issue-469311323.
+	 */
+	public function test_total_rounding_with_price_entered_has_high_precision() {
+		update_option( 'woocommerce_prices_include_tax', 'no' );
+		update_option( 'woocommerce_calc_taxes', 'yes' );
+		update_option( 'woocommerce_tax_round_at_subtotal', 'yes' );
+
+		WC()->cart->empty_cart();
+
+		$tax_rate = array(
+			'tax_rate_country'  => '',
+			'tax_rate_state'    => '',
+			'tax_rate'          => '20.0000',
+			'tax_rate_name'     => 'TAX20',
+			'tax_rate_priority' => '1',
+			'tax_rate_compound' => '0',
+			'tax_rate_shipping' => '0',
+			'tax_rate_order'    => '1',
+		);
+		WC_Tax::_insert_tax_rate( $tax_rate );
+		$product_30_82500 = WC_Helper_Product::create_simple_product( true, array( 'regular_price' => 30.82500 ) );
+
+		WC()->cart->add_to_cart( $product_30_82500->get_id() );
+
+		WC()->cart->calculate_totals();
+		// Since prices entered have higher precision, subtotal + tax will not equal to total.
+		$this->assertEquals( '30.83', wc_format_decimal( WC()->cart->get_subtotal(), 2 ) );
+		$this->assertEquals( '36.99', WC()->cart->get_total( 'edit' ) );
+		$this->assertEquals( '6.17', WC()->cart->get_total_tax() );
+	}
+}
diff --git a/tests/php/includes/class-wc-checkout-test.php b/tests/php/includes/class-wc-checkout-test.php
index 3a6867a1a5c..5b50a877d83 100644
--- a/tests/php/includes/class-wc-checkout-test.php
+++ b/tests/php/includes/class-wc-checkout-test.php
@@ -32,6 +32,8 @@ class WC_Checkout_Test extends \WC_Unit_Test_Case {
 			}
 		};
 		// phpcs:enable Generic.CodeAnalysis, Squiz.Commenting
+
+		WC()->cart->empty_cart();
 	}
 
 	/**
@@ -93,6 +95,30 @@ class WC_Checkout_Test extends \WC_Unit_Test_Case {
 		$this->assertEmpty( $errors->get_error_message( 'shipping_country_validation' ) );
 	}
 
+	/**
+	 * @testdox 'validate_posted_data' doesn't add errors for empty billing/shipping countries.
+	 *
+	 * @testWith [true]
+	 *           [false]
+	 *
+	 * @param bool $ship_to_different_address True to simulate shipping to a different address than the billing address.
+	 */
+	public function test_validate_posted_data_does_not_add_error_for_empty_country( $ship_to_different_address ) {
+		$_POST = array(
+			'billing_country'           => '',
+			'shipping_country'          => '',
+			'ship_to_different_address' => $ship_to_different_address,
+		);
+		$data  = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+
+		$errors = new WP_Error();
+
+		$this->sut->validate_posted_data( $data, $errors );
+
+		$this->assertEmpty( $errors->get_error_message( 'billing_country_validation' ) );
+		$this->assertEmpty( $errors->get_error_message( 'shipping_country_validation' ) );
+	}
+
 	/**
 	 * @testdox 'validate_checkout' adds a "We don't ship to country X" error but only if the country exists.
 	 *
diff --git a/tests/php/includes/customizer/class-wc-shop-customizer-test.php b/tests/php/includes/customizer/class-wc-shop-customizer-test.php
new file mode 100644
index 00000000000..0dc8057ccc9
--- /dev/null
+++ b/tests/php/includes/customizer/class-wc-shop-customizer-test.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Tests for WC_Shop_Customizer
+ */
+
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
+require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+require_once ABSPATH . WPINC . '/class-wp-customize-control.php';
+
+/**
+ * Tests for WC_Shop_Customizer
+ */
+class WC_Shop_Customizer_Test extends WC_Unit_Test_Case {
+
+	/**
+	 * Runs before each test of the class.
+	 */
+	public function setUp() {
+		remove_theme_support( 'woocommerce' );
+	}
+
+	/**
+	 * @testdox add_sections should add controls for image size settings only if these sizes haven't been explicitly declared as theme support (not counting default declarations).
+	 *
+	 * @testWith ["single_image_width", true, false]
+	 *           ["single_image_width", false, true]
+	 *           ["thumbnail_image_width", true, false]
+	 *           ["thumbnail_image_width", false, true]
+	 *
+	 * @param string $option_name The option name to test, either 'single_image_width' or 'thumbnail_image_width'.
+	 * @param bool   $add_explicit_theme_support True to test when theme support is added explicitly (not as a default value).
+	 * @param bool   $expected_to_have_added_customization True to expect the customization to have been added, false to expect it no to have been added.
+	 */
+	public function test_add_sections_should_add_image_controls_only_if_no_theme_support_for_image_sizes_is_defined( $option_name, $add_explicit_theme_support, $expected_to_have_added_customization ) {
+		$customize_manager = $this->createMock( WP_Customize_Manager::class );
+		$added_settings    = array();
+		$added_controls    = array();
+
+		$add_setting_callback = function( $id, $args = array() ) use ( &$added_settings ) {
+			array_push( $added_settings, $id );
+		};
+		$add_control_callback = function( $id, $args = array() ) use ( &$added_controls ) {
+			array_push( $added_controls, $id );
+		};
+		$customize_manager->method( 'add_setting' )->will( $this->returnCallback( $add_setting_callback ) );
+		$customize_manager->method( 'add_control' )->will( $this->returnCallback( $add_control_callback ) );
+
+		$theme_support      = $this->get_instance_of( ThemeSupport::class );
+		$add_support_method = $add_explicit_theme_support ? 'add_options' : 'add_default_options';
+		$theme_support->$add_support_method( array( $option_name => 1234 ) );
+
+		$sut = $this->get_legacy_instance_of( WC_Shop_Customizer::class );
+		$sut->add_sections( $customize_manager );
+
+		$this->assertEquals( $expected_to_have_added_customization, in_array( 'woocommerce_' . $option_name, $added_settings, true ) );
+		$this->assertEquals( $expected_to_have_added_customization, in_array( 'woocommerce_' . $option_name, $added_controls, true ) );
+	}
+}
diff --git a/tests/php/includes/data-stores/class-wc-customer-data-store-session-test.php b/tests/php/includes/data-stores/class-wc-customer-data-store-session-test.php
new file mode 100644
index 00000000000..75ef103b8e0
--- /dev/null
+++ b/tests/php/includes/data-stores/class-wc-customer-data-store-session-test.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Tests relating to the WC_Customer_Data_Store_Session class.
+ */
+class WC_Customer_Data_Store_Session_Test extends WC_Unit_Test_Case {
+	/**
+	 * Ensure that the country and state shipping address fields only inherit
+	 * the corresponding billing address values if a shipping address is not set.
+	 *
+	 * @see https://github.com/woocommerce/woocommerce/issues/28759
+	 * @dataProvider provide_customers_with_different_addresses
+	 *
+	 * @param WC_Customer $customer               The customer object being tested.
+	 * @param bool        $states_should_match    If the billing and shipping states should match.
+	 * @param bool        $countries_should_match If the billing and shipping countries should match.
+	 */
+	public function test_setting_default_address_fields( WC_Customer $customer, bool $states_should_match, bool $countries_should_match ) {
+		$session_data = new WC_Customer_Data_Store_Session();
+		$session_data->read( $customer );
+
+		if ( $states_should_match ) {
+			$this->assertEquals( $customer->get_shipping_state(), $customer->get_billing_state() );
+		} else {
+			$this->assertNotEquals( $customer->get_shipping_state(), $customer->get_billing_state() );
+		}
+
+		if ( $countries_should_match ) {
+			$this->assertEquals( $customer->get_shipping_country(), $customer->get_billing_country() );
+		} else {
+			$this->assertNotEquals( $customer->get_shipping_country(), $customer->get_billing_country() );
+		}
+	}
+
+	/**
+	 * Customer objects with a mixture of billing and shipping addresses.
+	 *
+	 * Each inner dataset is organized as follows:
+	 *
+	 *     [
+	 *         (WC_Customer) $customer_object,
+	 *         (bool) $states_should_match,
+	 *         (bool) $countries_should_match,
+	 *     ]
+	 *
+	 * @return array[]
+	 */
+	public function provide_customers_with_different_addresses() {
+		$has_billing_address_only = new WC_Customer();
+		$has_billing_address_only->set_email( 'wc-customer-test-01@test.user' );
+		$has_billing_address_only->set_billing_address( '1234 Quality Lane' );
+		$has_billing_address_only->set_billing_city( 'Testville' );
+		$has_billing_address_only->set_billing_country( 'US' );
+		$has_billing_address_only->set_billing_state( 'CA' );
+		$has_billing_address_only->set_billing_postcode( '90123' );
+		$has_billing_address_only->save();
+
+		$separate_billing_and_shipping_state_and_country = new WC_Customer();
+		$separate_billing_and_shipping_state_and_country->set_email( 'wc-customer-test-02@test.user' );
+		$separate_billing_and_shipping_state_and_country->set_billing_address( '4567 Scenario Street' );
+		$separate_billing_and_shipping_state_and_country->set_billing_city( 'Unitly' );
+		$separate_billing_and_shipping_state_and_country->set_billing_country( 'UK' );
+		$separate_billing_and_shipping_state_and_country->set_billing_state( 'Computershire' );
+		$separate_billing_and_shipping_state_and_country->set_billing_postcode( 'ZX1 2PQ' );
+		$separate_billing_and_shipping_state_and_country->set_shipping_address( '8901 Situation Court' );
+		$separate_billing_and_shipping_state_and_country->set_shipping_city( 'Endtoendly' );
+		$separate_billing_and_shipping_state_and_country->set_shipping_country( 'CA' );
+		$separate_billing_and_shipping_state_and_country->set_shipping_state( 'BC' );
+		$separate_billing_and_shipping_state_and_country->set_shipping_postcode( 'A1B 2C3' );
+		$separate_billing_and_shipping_state_and_country->save();
+
+		$separate_billing_state_same_country = new WC_Customer();
+		$separate_billing_state_same_country->set_email( 'wc-customer-test-03@test.user' );
+		$separate_billing_state_same_country->set_billing_address( '4567 Scenario Street' );
+		$separate_billing_state_same_country->set_billing_city( 'Unitly' );
+		$separate_billing_state_same_country->set_billing_country( 'UK' );
+		$separate_billing_state_same_country->set_billing_state( 'Computershire' );
+		$separate_billing_state_same_country->set_billing_postcode( 'ZX1 2PQ' );
+		$separate_billing_state_same_country->set_shipping_address( '8901 Situation Court' );
+		$separate_billing_state_same_country->set_shipping_city( 'Endtoendly' );
+		$separate_billing_state_same_country->set_shipping_country( 'UK' );
+		$separate_billing_state_same_country->set_shipping_state( 'Byteshire' );
+		$separate_billing_state_same_country->set_shipping_postcode( 'RS1 2TU' );
+		$separate_billing_state_same_country->save();
+
+		$shipping_address_is_effectively_empty = new WC_Customer();
+		$shipping_address_is_effectively_empty->set_email( 'wc-customer-test-04@test.user' );
+		$shipping_address_is_effectively_empty->set_shipping_address( ' ' );
+		$shipping_address_is_effectively_empty->save();
+
+		return array(
+			'has_billing_address_only' => array(
+				$has_billing_address_only,
+				true,
+				true,
+			),
+			'separate_billing_and_shipping_state_and_country' => array(
+				$separate_billing_and_shipping_state_and_country,
+				false,
+				false,
+			),
+			'separate_billing_state_same_country' => array(
+				$separate_billing_state_same_country,
+				false,
+				true,
+			),
+			'shipping_address_is_effectively_empty' => array(
+				$shipping_address_is_effectively_empty,
+				true,
+				true,
+			),
+		);
+	}
+}
diff --git a/tests/php/includes/wc-stock-functions-tests.php b/tests/php/includes/wc-stock-functions-tests.php
index 368eab017cf..4e04dc29d29 100644
--- a/tests/php/includes/wc-stock-functions-tests.php
+++ b/tests/php/includes/wc-stock-functions-tests.php
@@ -192,6 +192,17 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		}
 	}
 
+	/**
+	 * Assert that a value is equal to another one and is of integer type.
+	 *
+	 * @param mixed $expected The value $actual must be equal to.
+	 * @param mixed $actual The value to check for equality to $expected and for type.
+	 */
+	private function assertIsIntAndEquals( $expected, $actual ) {
+		$this->assertEquals( $expected, $actual );
+		self::assertIsInteger( $actual );
+	}
+
 	/**
 	 * Test wc_get_low_stock_amount with a simple product which has low stock amount set.
 	 */
@@ -200,7 +211,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$site_wide_low_stock_amount = 3;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Simple product, set low stock amount.
 		$product = WC_Helper_Product::create_simple_product(
@@ -212,7 +223,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 			)
 		);
 
-		$this->assertEquals( $product_low_stock_amount, wc_get_low_stock_amount( $product ) );
+		$this->assertIsIntAndEquals( $product_low_stock_amount, wc_get_low_stock_amount( $product ) );
 	}
 
 	/**
@@ -222,18 +233,18 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$site_wide_low_stock_amount = 3;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Simple product, don't set low stock amount.
 		$product = WC_Helper_Product::create_simple_product(
 			true,
 			array(
-				'manage_stock'     => true,
-				'stock_quantity'   => 10,
+				'manage_stock'   => true,
+				'stock_quantity' => 10,
 			)
 		);
 
-		$this->assertEquals( $site_wide_low_stock_amount, wc_get_low_stock_amount( $product ) );
+		$this->assertIsIntAndEquals( $site_wide_low_stock_amount, wc_get_low_stock_amount( $product ) );
 	}
 
 	/**
@@ -245,7 +256,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$variation_low_stock_amount = 7;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Parent low stock amount NOT set.
 		$variable_product = WC_Helper_Product::create_variation_product();
@@ -254,22 +265,22 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 
 		// Set the variation low stock amount.
 		$variations = $variable_product->get_available_variations( 'objects' );
-		$var1 = $variations[0];
+		$var1       = $variations[0];
 		$var1->set_manage_stock( true );
 		$var1->set_low_stock_amount( $variation_low_stock_amount );
 		$var1->save();
 
-		$this->assertEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 
 		// Even after turning on manage stock on the parent, but with no value.
 		$variable_product->set_manage_stock( true );
 		$variable_product->save();
-		$this->assertEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 
 		// Ans also after turning the manage stock off again on the parent.
 		$variable_product->set_manage_stock( false );
 		$variable_product->save();
-		$this->assertEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 	}
 
 	/**
@@ -282,7 +293,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$variation_low_stock_amount = 7;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Set the parent low stock amount.
 		$variable_product = WC_Helper_Product::create_variation_product();
@@ -292,12 +303,12 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 
 		// Set the variation low stock amount.
 		$variations = $variable_product->get_available_variations( 'objects' );
-		$var1 = $variations[0];
+		$var1       = $variations[0];
 		$var1->set_manage_stock( true );
 		$var1->set_low_stock_amount( $variation_low_stock_amount );
 		$var1->save();
 
-		$this->assertEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $variation_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 	}
 
 	/**
@@ -309,7 +320,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$parent_low_stock_amount    = 5;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Set the parent low stock amount.
 		$variable_product = WC_Helper_Product::create_variation_product();
@@ -319,9 +330,9 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 
 		// Don't set the variation low stock amount.
 		$variations = $variable_product->get_available_variations( 'objects' );
-		$var1 = $variations[0];
+		$var1       = $variations[0];
 
-		$this->assertEquals( $parent_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $parent_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 	}
 
 	/**
@@ -332,7 +343,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 		$site_wide_low_stock_amount = 3;
 
 		// Set the store-wide default.
-		update_option( 'woocommerce_notify_low_stock_amount', $site_wide_low_stock_amount );
+		update_option( 'woocommerce_notify_low_stock_amount', strval( $site_wide_low_stock_amount ) );
 
 		// Set the parent low stock amount.
 		$variable_product = WC_Helper_Product::create_variation_product();
@@ -340,10 +351,10 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 
 		// Don't set the variation low stock amount.
 		$variations = $variable_product->get_available_variations( 'objects' );
-		$var1 = $variations[0];
+		$var1       = $variations[0];
 		$var1->set_manage_stock( false );
 
-		$this->assertEquals( $site_wide_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
+		$this->assertIsIntAndEquals( $site_wide_low_stock_amount, wc_get_low_stock_amount( $var1 ) );
 	}
 
 }
diff --git a/tests/php/src/Internal/AssignDefaultCategoryTest.php b/tests/php/src/Internal/AssignDefaultCategoryTest.php
new file mode 100644
index 00000000000..1b638b56e19
--- /dev/null
+++ b/tests/php/src/Internal/AssignDefaultCategoryTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * AssignDefaultCategoryTest class file.
+ */
+
+namespace Automattic\WooCommerce\Tests\Internal;
+
+use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+use Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper;
+
+/**
+ * Tests for AssignDefaultCategory.
+ */
+class AssignDefaultCategoryTest extends \WC_Unit_Test_Case {
+	/**
+	 * The system under test.
+	 *
+	 * @var AssignDefaultCategory
+	 */
+	private $sut;
+
+	/**
+	 * Test to make sure products without categories will be
+	 * assigned a default category always.
+	 */
+	public function test_products_are_assigned_a_default_category() {
+		global $wpdb;
+
+		$this->sut        = new AssignDefaultCategory();
+		$product1         = ProductHelper::create_simple_product();
+		$product2         = ProductHelper::create_simple_product();
+		$product3         = ProductHelper::create_simple_product();
+		$default_category = (int) get_option( 'default_product_cat', 0 );
+
+		$products = array( $product1, $product2, $product3 );
+
+		// Remove all categories from products.
+		foreach ( $products as $product ) {
+			$result = $wpdb->query(
+				$wpdb->prepare(
+					"DELETE FROM {$wpdb->term_relationships} WHERE object_id = %d AND term_taxonomy_id = %d",
+					$product->get_id(),
+					$default_category
+				)
+			);
+		}
+
+		// Ensure all categories are removed from products.
+		foreach ( $products as $product ) {
+			$cats = wp_get_post_terms( $product->get_id(), 'product_cat' );
+
+			$this->assertEmpty( $cats );
+		}
+
+		// Add in default category.
+		$this->sut->maybe_assign_default_product_cat();
+
+		// Ensure default category are now assigned to products.
+		foreach ( $products as $product ) {
+			$cats = wp_list_pluck( wp_get_post_terms( $product->get_id(), 'product_cat' ), 'term_id' );
+
+			$this->assertContains( $default_category, $cats );
+		}
+	}
+}
diff --git a/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php b/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
index 9f7ccc99671..679c45913e9 100644
--- a/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
+++ b/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
@@ -103,6 +103,20 @@ class ExtendedContainerTest extends \WC_Unit_Test_Case {
 		$this->assertSame( $instance_2, $this->sut->get( DependencyClass::class ) );
 	}
 
+	/**
+	 * @testdox 'replace' should allow to replace existing registrations with anonymous classes.
+	 */
+	public function test_replace_allows_replacing_existing_registrations_with_anonymous_classes() {
+		$instance_1 = new DependencyClass();
+		$instance_2 = new class() extends DependencyClass {};
+
+		$this->sut->add( DependencyClass::class, $instance_1, true );
+		$this->assertSame( $instance_1, $this->sut->get( DependencyClass::class ) );
+
+		$this->sut->replace( DependencyClass::class, $instance_2, true );
+		$this->assertSame( $instance_2, $this->sut->get( DependencyClass::class ) );
+	}
+
 	/**
 	 * @testdox 'reset_all_resolved' should discard cached resolutions for classes registered as 'shared'.
 	 */
diff --git a/tests/php/src/Internal/ProductAttributesLookup/DataRegeneratorTest.php b/tests/php/src/Internal/ProductAttributesLookup/DataRegeneratorTest.php
new file mode 100644
index 00000000000..a40f97c42a2
--- /dev/null
+++ b/tests/php/src/Internal/ProductAttributesLookup/DataRegeneratorTest.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * DataRegeneratorTest class file.
+ */
+
+namespace Automattic\WooCommerce\Tests\Internal\ProductAttributesLookup;
+
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\LookupDataStore;
+use Automattic\WooCommerce\Testing\Tools\FakeQueue;
+
+/**
+ * Tests for the DataRegenerator class.
+ * @package Automattic\WooCommerce\Tests\Internal\ProductAttributesLookup
+ */
+class DataRegeneratorTest extends \WC_Unit_Test_Case {
+
+	/**
+	 * The system under test.
+	 *
+	 * @var DataRegenerator
+	 */
+	private $sut;
+
+	/**
+	 * @var LookupDataStore
+	 */
+	private $lookup_data_store;
+
+	/**
+	 * @var string
+	 */
+	private $lookup_table_name;
+
+	/**
+	 * @var FakeQueue
+	 */
+	private $queue;
+
+	/**
+	 * Runs before each test.
+	 */
+	public function setUp() {
+		global $wpdb;
+
+		parent::setUp();
+
+		$this->lookup_table_name = $wpdb->prefix . 'wc_product_attributes_lookup';
+
+		// phpcs:disable Squiz.Commenting
+		$this->lookup_data_store = new class() extends LookupDataStore {
+			public $passed_products = array();
+
+			public function update_data_for_product( $product ) {
+				$this->passed_products[] = $product;
+			}
+		};
+		// phpcs:enable Squiz.Commenting
+
+		// This is needed to prevent the hook to act on the already registered LookupDataStore class.
+		remove_all_actions( 'woocommerce_run_product_attribute_lookup_update_callback' );
+
+		$container = wc_get_container();
+		$container->reset_all_resolved();
+		$container->replace( LookupDataStore::class, $this->lookup_data_store );
+		$this->sut = $container->get( DataRegenerator::class );
+
+		$this->register_legacy_proxy_class_mocks(
+			array(
+				\WC_Queue::class => new FakeQueue(),
+			)
+		);
+		$this->queue = $this->get_legacy_instance_of( \WC_Queue::class );
+	}
+
+	/**
+	 * @testdox `initiate_regeneration` creates the lookup table, deleting it first if it already existed.
+	 *
+	 * @testWith [false]
+	 *           [true]
+	 *
+	 * @param bool $previously_existing True to create a lookup table beforehand.
+	 */
+	public function test_initiate_regeneration_creates_looukp_table( $previously_existing ) {
+		global $wpdb;
+
+		// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
+
+		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->lookup_table_name );
+
+		if ( $previously_existing ) {
+			$wpdb->query( 'CREATE TABLE ' . $this->lookup_table_name . ' (foo int);' );
+		}
+
+		$this->sut->initiate_regeneration();
+
+		// Try to insert a row to verify that the table exists.
+		// We can't use the regular table existence detection mechanisms because PHPUnit creates all tables as temporary.
+		$wpdb->query( 'INSERT INTO ' . $this->lookup_table_name . " VALUES (1, 1, 'taxonomy', 1, 1, 1 )" );
+		$value = $wpdb->get_var( 'SELECT product_id FROM ' . $this->lookup_table_name . ' LIMIT 1' );
+		$this->assertEquals( 1, $value );
+
+		// phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
+	}
+
+	/**
+	 * @testdox `initiate_regeneration` initializes the transient options, and enqueues the first step for time()+1.
+	 */
+	public function test_initiate_regeneration_initializes_temporary_options_and_enqueues_regeneration_step() {
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'wc_get_products' => function( $args ) {
+					return array( 100 );
+				},
+				'time'            => function() {
+					return 1000;
+				},
+			)
+		);
+
+		$this->sut->initiate_regeneration();
+
+		$this->assertEquals( 100, get_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ) );
+		$this->assertEquals( 0, get_option( 'woocommerce_attribute_lookup__last_products_page_processed' ) );
+		$this->assertFalse( get_option( 'woocommerce_attribute_lookup__enabled' ) );
+
+		$expected_enqueued = array(
+			'method'    => 'schedule_single',
+			'args'      => array(),
+			'timestamp' => 1001,
+			'hook'      => 'woocommerce_run_product_attribute_lookup_update_callback',
+			'group'     => 'woocommerce-db-updates',
+		);
+		$actual_enqueued   = current( $this->queue->methods_called );
+
+		$this->assertEquals( sort( $expected_enqueued ), sort( $actual_enqueued ) );
+	}
+
+	/**
+	 * @testdox `initiate_regeneration` finalizes the regeneration process without enqueueing any step if the db is empty.
+	 *
+	 * @testWith [false]
+	 *           [[]]
+	 *
+	 * @param mixed $get_products_result Result from wc_get_products.
+	 */
+	public function test_initiate_regeneration_does_not_enqueues_regeneration_step_when_no_products( $get_products_result ) {
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'wc_get_products' => function( $args ) use ( $get_products_result ) {
+					return $get_products_result;
+				},
+			)
+		);
+
+		$this->sut->initiate_regeneration();
+
+		$this->assertFalse( get_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ) );
+		$this->assertFalse( get_option( 'woocommerce_attribute_lookup__last_products_page_processed' ) );
+		$this->assertEquals( 'no', get_option( 'woocommerce_attribute_lookup__enabled' ) );
+		$this->assertEmpty( $this->queue->methods_called );
+	}
+
+	/**
+	 * @testdox `initiate_regeneration` processes one chunk of products IDs and enqueues next step if there are more products available.
+	 */
+	public function test_initiate_regeneration_correctly_processes_ids_and_enqueues_next_step() {
+		$requested_products_pages = array();
+
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'wc_get_products' => function( $args ) use ( &$requested_products_pages ) {
+					if ( 'DESC' === current( $args['orderby'] ) ) {
+						return array( 100 );
+					} else {
+						$requested_products_pages[] = $args['page'];
+						return array( 1, 2, 3 );
+					}
+				},
+				'time'            => function() {
+					return 1000;
+				},
+			)
+		);
+
+		$this->sut->initiate_regeneration();
+		$this->queue->methods_called = array();
+
+		update_option( 'woocommerce_attribute_lookup__last_products_page_processed', 7 );
+
+		do_action( 'woocommerce_run_product_attribute_lookup_update_callback' );
+
+		$this->assertEquals( array( 1, 2, 3 ), $this->lookup_data_store->passed_products );
+		$this->assertEquals( array( 8 ), $requested_products_pages );
+		$this->assertEquals( 8, get_option( 'woocommerce_attribute_lookup__last_products_page_processed' ) );
+
+		$expected_enqueued = array(
+			'method'    => 'schedule_single',
+			'args'      => array(),
+			'timestamp' => 1001,
+			'hook'      => 'woocommerce_run_product_attribute_lookup_update_callback',
+			'group'     => 'woocommerce-db-updates',
+		);
+		$actual_enqueued   = current( $this->queue->methods_called );
+		$this->assertEquals( sort( $expected_enqueued ), sort( $actual_enqueued ) );
+	}
+
+	/**
+	 * @testdox `initiate_regeneration` finishes regeneration when the max product id is reached or no more products are returned.
+	 *
+	 * @testWith [[98,99,100]]
+	 *           [[99,100,101]]
+	 *           [[]]
+	 *
+	 * @param array $product_ids The products ids that wc_get_products will return.
+	 */
+	public function test_initiate_regeneration_finishes_when_no_more_products_available( $product_ids ) {
+		$requested_products_pages = array();
+
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'wc_get_products' => function( $args ) use ( &$requested_products_pages, $product_ids ) {
+					if ( 'DESC' === current( $args['orderby'] ) ) {
+						return array( 100 );
+					} else {
+						$requested_products_pages[] = $args['page'];
+						return $product_ids;
+					}
+				},
+			)
+		);
+
+		$this->sut->initiate_regeneration();
+		$this->queue->methods_called = array();
+
+		do_action( 'woocommerce_run_product_attribute_lookup_update_callback' );
+
+		$this->assertEquals( $product_ids, $this->lookup_data_store->passed_products );
+		$this->assertFalse( get_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ) );
+		$this->assertFalse( get_option( 'woocommerce_attribute_lookup__last_products_page_processed' ) );
+		$this->assertEquals( 'no', get_option( 'woocommerce_attribute_lookup__enabled' ) );
+		$this->assertEmpty( $this->queue->methods_called );
+	}
+}
diff --git a/tests/php/src/Internal/ProductAttributesLookup/LookupDataStoreTest.php b/tests/php/src/Internal/ProductAttributesLookup/LookupDataStoreTest.php
new file mode 100644
index 00000000000..58895eb4746
--- /dev/null
+++ b/tests/php/src/Internal/ProductAttributesLookup/LookupDataStoreTest.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * LookupDataStoreTest class file.
+ */
+
+namespace Automattic\WooCommerce\Tests\Internal\ProductAttributesLookup;
+
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\LookupDataStore;
+use Automattic\WooCommerce\Testing\Tools\FakeQueue;
+use Automattic\WooCommerce\Utilities\ArrayUtil;
+
+/**
+ * Tests for the LookupDataStore class.
+ * @package Automattic\WooCommerce\Tests\Internal\ProductAttributesLookup
+ */
+class LookupDataStoreTest extends \WC_Unit_Test_Case {
+
+	/**
+	 * The system under test.
+	 *
+	 * @var LookupDataStore
+	 */
+	private $sut;
+
+	/**
+	 * Runs before each test.
+	 */
+	public function setUp() {
+		global $wpdb;
+
+		$this->sut = new LookupDataStore();
+
+		// Initiating regeneration with a fake queue will just create the lookup table in the database.
+		add_filter(
+			'woocommerce_queue_class',
+			function() {
+				return FakeQueue::class;
+			}
+		);
+		$this->get_instance_of( DataRegenerator::class )->initiate_regeneration();
+	}
+
+	/**
+	 * @testdox `test_update_data_for_product` throws an exception if a variation is passed.
+	 */
+	public function test_update_data_for_product_throws_if_variation_is_passed() {
+		$product = new \WC_Product_Variation();
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( "LookupDataStore::update_data_for_product can't be called for variations." );
+
+		$this->sut->update_data_for_product( $product );
+	}
+
+	/**
+	 * @testdox `test_update_data_for_product` creates the appropriate entries for simple products, skipping custom product attributes.
+	 *
+	 * @testWith [true]
+	 *           [false]
+	 *
+	 * @param bool $in_stock 'true' if the product is supposed to be in stock.
+	 */
+	public function test_update_data_for_simple_product( $in_stock ) {
+		$product = new \WC_Product_Simple();
+		$product->set_id( 10 );
+		$this->set_product_attributes(
+			$product,
+			array(
+				'pa_attribute_1'      => array(
+					'id'      => 100,
+					'options' => array( 51, 52 ),
+				),
+				'pa_attribute_2'      => array(
+					'id'      => 200,
+					'options' => array( 73, 74 ),
+				),
+				'pa_custom_attribute' => array(
+					'id'      => 0,
+					'options' => array( 'foo', 'bar' ),
+				),
+			)
+		);
+
+		if ( $in_stock ) {
+			$product->set_stock_status( 'instock' );
+			$expected_in_stock = 1;
+		} else {
+			$product->set_stock_status( 'outofstock' );
+			$expected_in_stock = 0;
+		}
+
+		$this->sut->update_data_for_product( $product );
+
+		$expected = array(
+			array(
+				'product_id'             => 10,
+				'product_or_parent_id'   => 10,
+				'taxonomy'               => 'pa_attribute_1',
+				'term_id'                => 51,
+				'in_stock'               => $expected_in_stock,
+				'is_variation_attribute' => 0,
+			),
+			array(
+				'product_id'             => 10,
+				'product_or_parent_id'   => 10,
+				'taxonomy'               => 'pa_attribute_1',
+				'term_id'                => 52,
+				'in_stock'               => $expected_in_stock,
+				'is_variation_attribute' => 0,
+			),
+			array(
+				'product_id'             => 10,
+				'product_or_parent_id'   => 10,
+				'taxonomy'               => 'pa_attribute_2',
+				'term_id'                => 73,
+				'in_stock'               => $expected_in_stock,
+				'is_variation_attribute' => 0,
+			),
+			array(
+				'product_id'             => 10,
+				'product_or_parent_id'   => 10,
+				'taxonomy'               => 'pa_attribute_2',
+				'term_id'                => 74,
+				'in_stock'               => $expected_in_stock,
+				'is_variation_attribute' => 0,
+			),
+		);
+
+		$actual = $this->get_lookup_table_data();
+
+		$this->assertEquals( sort( $expected ), sort( $actual ) );
+	}
+
+	/**
+	 * @testdox `test_update_data_for_product` creates the appropriate entries for variable products.
+	 */
+	public function test_update_data_for_variable_product() {
+		$products = array();
+
+		/**
+		 * Create one normal attribute and two attributes used to define variations,
+		 * with 4 terms each.
+		 */
+
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'get_terms'      => function( $args ) use ( &$invokations_of_get_terms ) {
+					switch ( $args['taxonomy'] ) {
+						case 'non-variation-attribute':
+							return array(
+								10 => 'term_10',
+								20 => 'term_20',
+								30 => 'term_30',
+								40 => 'term_40',
+							);
+						case 'variation-attribute-1':
+							return array(
+								50 => 'term_50',
+								60 => 'term_60',
+								70 => 'term_70',
+								80 => 'term_80',
+							);
+						case 'variation-attribute-2':
+							return array(
+								90  => 'term_90',
+								100 => 'term_100',
+								110 => 'term_110',
+								120 => 'term_120',
+							);
+						default:
+							throw new \Exception( "Unexpected call to 'get_terms'" );
+					}
+				},
+				'wc_get_product' => function( $id ) use ( &$products ) {
+					return $products[ $id ];
+				},
+			)
+		);
+
+		/**
+		 * Create a variable product with:
+		 * - 3 of the 4 values of the regular attribute.
+		 * - A custom product attribute.
+		 * - The two variation attributes, with 3 of the 4 terms for each one.
+		 * - Variation 1 having one value for each of the variation attributes.
+		 * - Variation 2 having one value for variation-attribute-1
+		 *   but none for variation-attribute-2 (so the value for that one is "Any").
+		 */
+
+		$product = new \WC_Product_Variable();
+		$product->set_id( 1000 );
+		$this->set_product_attributes(
+			$product,
+			array(
+				'non-variation-attribute' => array(
+					'id'      => 100,
+					'options' => array( 10, 20, 30 ),
+				),
+				'pa_custom_attribute'     => array(
+					'id'      => 0,
+					'options' => array( 'foo', 'bar' ),
+				),
+				'variation-attribute-1'   => array(
+					'id'        => 200,
+					'options'   => array( 50, 60, 70 ),
+					'variation' => true,
+				),
+				'variation-attribute-2'   => array(
+					'id'        => 300,
+					'options'   => array( 90, 100, 110 ),
+					'variation' => true,
+				),
+			)
+		);
+		$product->set_stock_status( 'instock' );
+
+		$variation_1 = new \WC_Product_Variation();
+		$variation_1->set_id( 1001 );
+		$variation_1->set_attributes(
+			array(
+				'variation-attribute-1' => 'term_50',
+				'variation-attribute-2' => 'term_90',
+			)
+		);
+		$variation_1->set_stock_status( 'instock' );
+
+		$variation_2 = new \WC_Product_Variation();
+		$variation_2->set_id( 1002 );
+		$variation_2->set_attributes(
+			array(
+				'variation-attribute-1' => 'term_60',
+			)
+		);
+		$variation_2->set_stock_status( 'outofstock' );
+
+		$product->set_children( array( 1001, 1002 ) );
+		$products[1000] = $product;
+		$products[1001] = $variation_1;
+		$products[1002] = $variation_2;
+
+		$this->sut->update_data_for_product( $product );
+
+		$expected = array(
+			// Main product: one entry for each of the regular attribute values,
+				// excluding custom product attributes.
+
+				array(
+					'product_id'             => '1000',
+					'product_or_parent_id'   => '1000',
+					'taxonomy'               => 'non-variation-attribute',
+					'term_id'                => '10',
+					'is_variation_attribute' => '0',
+					'in_stock'               => '1',
+				),
+			array(
+				'product_id'             => '1000',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'non-variation-attribute',
+				'term_id'                => '20',
+				'is_variation_attribute' => '0',
+				'in_stock'               => '1',
+			),
+			array(
+				'product_id'             => '1000',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'non-variation-attribute',
+				'term_id'                => '30',
+				'is_variation_attribute' => '0',
+				'in_stock'               => '1',
+			),
+
+			// Variation 1: one entry for each of the defined variation attributes.
+
+			array(
+				'product_id'             => '1001',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'variation-attribute-1',
+				'term_id'                => '50',
+				'is_variation_attribute' => '1',
+				'in_stock'               => '1',
+			),
+			array(
+				'product_id'             => '1001',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'variation-attribute-2',
+				'term_id'                => '90',
+				'is_variation_attribute' => '1',
+				'in_stock'               => '1',
+			),
+
+			// Variation 2: one entry for the defined value for variation-attribute-1,
+				// then one for each of the possible values of variation-attribute-2
+				// (the values defined in the parent product).
+
+				array(
+					'product_id'             => '1002',
+					'product_or_parent_id'   => '1000',
+					'taxonomy'               => 'variation-attribute-1',
+					'term_id'                => '60',
+					'is_variation_attribute' => '1',
+					'in_stock'               => '0',
+				),
+			array(
+				'product_id'             => '1002',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'variation-attribute-2',
+				'term_id'                => '90',
+				'is_variation_attribute' => '1',
+				'in_stock'               => '0',
+			),
+			array(
+				'product_id'             => '1002',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'variation-attribute-2',
+				'term_id'                => '100',
+				'is_variation_attribute' => '1',
+				'in_stock'               => '0',
+			),
+			array(
+				'product_id'             => '1002',
+				'product_or_parent_id'   => '1000',
+				'taxonomy'               => 'variation-attribute-2',
+				'term_id'                => '110',
+				'is_variation_attribute' => '1',
+				'in_stock'               => '0',
+			),
+		);
+
+		$actual = $this->get_lookup_table_data();
+		$this->assertEquals( sort( $expected ), sort( $actual ) );
+	}
+
+	/**
+	 * Set the product attributes from an array with this format:
+	 *
+	 * [
+	 *   'taxonomy_or_custom_attribute_name' =>
+	 *      [
+	 *        'id' => attribute id (0 for custom product attribute),
+	 *        'options' => [term_id, term_id...] (for custom product attributes: ['term', 'term'...]
+	 *        'variation' => 1|0 (optional, default 0)
+	 *      ], ...
+	 * ]
+	 *
+	 * @param WC_Product $product The product to set the attributes.
+	 * @param array      $attributes_data The attributes to set.
+	 */
+	private function set_product_attributes( $product, $attributes_data ) {
+		$attributes = array();
+		foreach ( $attributes_data as $taxonomy => $attribute_data ) {
+			$attribute = new \WC_Product_Attribute();
+			$attribute->set_id( $attribute_data['id'] );
+			$attribute->set_name( $taxonomy );
+			$attribute->set_options( $attribute_data['options'] );
+			$attribute->set_variation( ArrayUtil::get_value_or_default( $attribute_data, 'variation', false ) );
+			$attributes[] = $attribute;
+		}
+
+		$product->set_attributes( $attributes );
+	}
+
+	/**
+	 * Get all the data in the lookup table as an array of associative arrays.
+	 *
+	 * @return array All the rows in the lookup table as an array of associative arrays.
+	 */
+	private function get_lookup_table_data() {
+		global $wpdb;
+
+		$result = $wpdb->get_results( 'select * from ' . $wpdb->prefix . 'wc_product_attributes_lookup', ARRAY_A );
+
+		foreach ( $result as $row ) {
+			foreach ( $row as $column_name => $value ) {
+				if ( 'taxonomy' !== $column_name ) {
+					$row[ $column_name ] = (int) $value;
+				}
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/tests/php/src/ThemeSupport/ThemeSupportTest.php b/tests/php/src/ThemeSupport/ThemeSupportTest.php
new file mode 100644
index 00000000000..0add81a3415
--- /dev/null
+++ b/tests/php/src/ThemeSupport/ThemeSupportTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Tests for ThemeSupport
+ *
+ * @package Automattic\WooCommerce\Tests\ThemeSupport
+ */
+
+namespace Automattic\WooCommerce\Tests\ThemeManagement;
+
+use Automattic\WooCommerce\Internal\ThemeSupport;
+
+/**
+ * Tests for ThemeSupport
+ */
+class ThemeSupportTest extends \WC_Unit_Test_Case {
+
+	/**
+	 * The system under test.
+	 *
+	 * @var ThemeSupport
+	 */
+	private $sut;
+
+	/**
+	 * Runs before each test.
+	 */
+	public function setUp() {
+		$this->sut = $this->get_instance_of( ThemeSupport::class );
+		remove_theme_support( 'woocommerce' );
+	}
+
+	/**
+	 * @testdox add_options should add the supplied options under the 'woocommerce' feature.
+	 */
+	public function test_add_options() {
+		$actual_added_feature = null;
+		$actual_added_options = null;
+
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'add_theme_support' => function( $feature, ...$args ) use ( &$actual_added_feature, &$actual_added_options ) {
+					$actual_added_feature = $feature;
+					$actual_added_options = $args;
+				},
+			)
+		);
+
+		$options = array( 'foo' => 'bar' );
+		$this->sut->add_options( $options );
+
+		$this->assertEquals( 'woocommerce', $actual_added_feature );
+		$this->assertEquals( $options, $actual_added_options[0] );
+
+		$this->reset_legacy_proxy_mocks();
+
+		$this->sut->add_options( $options );
+
+		$actual_retrieved_options = get_theme_support( 'woocommerce' )[0];
+		$this->assertEquals( $options, $actual_retrieved_options );
+	}
+
+	/**
+	 * @testdox add_default_options should add the supplied options under the 'woocommerce' feature on a '_defaults' key.
+	 */
+	public function test_2_add_default_options() {
+		$actual_added_options = array();
+
+		$this->register_legacy_proxy_function_mocks(
+			array(
+				'add_theme_support' => function( $feature, ...$args ) use ( &$actual_added_options ) {
+					array_push( $actual_added_options, $args );
+				},
+			)
+		);
+
+		$this->sut->add_default_options( array( 'foo' => 'bar' ) );
+		$this->sut->add_default_options( array( 'fizz' => 'buzz' ) );
+
+		$expected_added_options = array(
+			array(
+				array(
+					ThemeSupport::DEFAULTS_KEY =>
+						array(
+							'foo' => 'bar',
+						),
+				),
+			),
+			array(
+				array(
+					ThemeSupport::DEFAULTS_KEY =>
+						array(
+							'fizz' => 'buzz',
+						),
+				),
+			),
+		);
+
+		$this->assertEquals( $expected_added_options, $actual_added_options );
+
+		$this->reset_legacy_proxy_mocks();
+
+		$this->sut->add_default_options( array( 'foo' => 'bar' ) );
+		$this->sut->add_default_options( array( 'fizz' => 'buzz' ) );
+
+		$actual_retrieved_options   = get_theme_support( 'woocommerce' )[0];
+		$expected_retrieved_options = array(
+			ThemeSupport::DEFAULTS_KEY => array(
+				'foo'  => 'bar',
+				'fizz' => 'buzz',
+			),
+		);
+		$this->assertEquals( $expected_retrieved_options, $actual_retrieved_options );
+	}
+
+	/**
+	 * @testdox add_default_options should add the supplied options under the 'woocommerce' feature on a '_defaults' key.
+	 */
+	public function test_add_default_options() {
+		$this->sut->add_default_options( array( 'foo' => 'bar' ) );
+		$this->sut->add_default_options( array( 'fizz' => 'buzz' ) );
+
+		$actual   = get_theme_support( 'woocommerce' )[0];
+		$expected = array(
+			ThemeSupport::DEFAULTS_KEY => array(
+				'foo'  => 'bar',
+				'fizz' => 'buzz',
+			),
+		);
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * @testdox get_option should return all the options under the 'woocommerce' feature when invoked with blank option name.
+	 */
+	public function test_get_option_with_no_option_name() {
+		$options = array( 'foo' => 'bar' );
+		$this->sut->add_options( $options );
+
+		$actual = $this->sut->get_option();
+		$this->assertEquals( $options, $actual );
+	}
+
+	/**
+	 * @testdox get_option should return null if no 'woocommerce' feature exists and no default value is supplied.
+	 */
+	public function test_get_option_with_no_option_name_when_no_options_exist_and_no_default_value_supplied() {
+		$actual = $this->sut->get_option();
+		$this->assertNull( $actual );
+	}
+
+	/**
+	 * @testdox get_option should return the supplied default value if no 'woocommerce' feature exists.
+	 */
+	public function test_get_option_with_no_option_name_when_no_options_exist_and_default_value_supplied() {
+		$actual = $this->sut->get_option( '', 'DEFAULT' );
+		$this->assertEquals( 'DEFAULT', $actual );
+	}
+
+	/**
+	 * @testdox get_theme_support should return the value of the requested option if it exists.
+	 */
+	public function test_get_theme_support_with_option_name() {
+		$options = array( 'foo' => array( 'bar' => 'fizz' ) );
+		$this->sut->add_options( $options );
+
+		$actual = $this->sut->get_option( 'foo::bar' );
+		$this->assertEquals( 'fizz', $actual );
+	}
+
+	/**
+	 * @testdox get_option should return null if the requested option doesn't exist and no default value is supplied.
+	 */
+	public function test_get_option_with_option_name_when_option_does_not_exist_and_no_default_value_supplied() {
+		$options = array( 'foo' => array( 'bar' => 'fizz' ) );
+		$this->sut->add_options( $options );
+
+		$actual = $this->sut->get_option( 'buzz' );
+		$this->assertNull( $actual );
+	}
+
+	/**
+	 * @testdox get_option should return the supplied default value if the requested option doesn't exist.
+	 */
+	public function test_get_option_with_option_name_when_option_does_not_exist_and_default_value_supplied() {
+		$options = array( 'foo' => array( 'bar' => 'fizz' ) );
+		$this->sut->add_options( $options );
+
+		$actual = $this->sut->get_option( 'buzz', 'DEFAULT' );
+		$this->assertEquals( 'DEFAULT', $actual );
+	}
+
+	/**
+	 * @testdox get_option should return the value of the requested option if it has been defined as a default.
+	 */
+	public function test_get_option_with_option_name_and_option_defined_as_default() {
+		$options = array( 'foo' => array( 'bar' => 'fizz' ) );
+		$this->sut->add_default_options( $options );
+
+		$actual = $this->sut->get_option( 'foo::bar' );
+		$this->assertEquals( 'fizz', $actual );
+	}
+
+	/**
+	 * @testdox has_option should return false if no 'woocommerce' feature exists.
+	 *
+	 * @testWith [true]
+	 *           [false]
+	 *
+	 * @param bool $include_defaults Whether to include defaults in the search or not.
+	 */
+	public function test_has_option_when_no_woocommerce_feature_is_defined( $include_defaults ) {
+		$this->assertFalse( $this->sut->has_option( 'foo::bar', $include_defaults ) );
+	}
+
+	/**
+	 * @testdox has_option should return false if the specified option has not been defined.
+	 *
+	 * @testWith [true]
+	 *           [false]
+	 *
+	 * @param bool $include_defaults Whether to include defaults in the search or not.
+	 */
+	public function test_has_option_when_option_is_not_defined( $include_defaults ) {
+		$this->sut->add_options( array( 'foo' => 'bar' ) );
+		$this->assertFalse( $this->sut->has_option( 'fizz::buzz', $include_defaults ) );
+	}
+
+	/**
+	 * @testdox has_option should return true if the specified option has been defined.
+	 *
+	 * @testWith [true]
+	 *           [false]
+	 *
+	 * @param bool $include_defaults Whether to include defaults in the search or not.
+	 */
+	public function test_has_option_when_option_is_defined( $include_defaults ) {
+		$this->sut->add_options( array( 'foo' => 'bar' ) );
+		$this->assertTrue( $this->sut->has_option( 'foo', $include_defaults ) );
+	}
+
+	/**
+	 * @testdox If an option has been defined as a default, has_theme_support should return true if $include_defaults is passed as true, should return false otherwise.
+	 *
+	 * @testWith [true, true]
+	 *           [false, false]
+	 *
+	 * @param bool $include_defaults Whether to include defaults in the search or not.
+	 * @param bool $expected_result The expected return value from the tested method.
+	 */
+	public function test_has_option_when_option_is_defined_as_default( $include_defaults, $expected_result ) {
+		$this->sut->add_default_options( array( 'foo' => 'bar' ) );
+		$this->assertEquals( $expected_result, $this->sut->has_option( 'foo', $include_defaults ) );
+	}
+}
diff --git a/tests/php/src/Utilities/ArrayUtilTest.php b/tests/php/src/Utilities/ArrayUtilTest.php
new file mode 100644
index 00000000000..f7bbc439089
--- /dev/null
+++ b/tests/php/src/Utilities/ArrayUtilTest.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Automattic\WooCommerce\Tests\Utilities;
+
+use Automattic\WooCommerce\Utilities\ArrayUtil;
+
+/**
+ * A collection of tests for the array utility class.
+ */
+class ArrayUtilTest extends \WC_Unit_Test_Case {
+
+	/**
+	 * @testdox `get_nested_value` should return null if the requested key doesn't exist and no default value is supplied.
+	 *
+	 * @testWith ["foo"]
+	 *           ["foo::bar"]
+	 *
+	 * @param string $key The key to test.
+	 */
+	public function test_get_nested_value_returns_null_if_non_existing_key_and_default_not_supplied( $key ) {
+		$array  = array( 'fizz' => 'buzz' );
+		$actual = ArrayUtil::get_nested_value( $array, $key );
+
+		$this->assertNull( $actual );
+	}
+
+	/**
+	 * @testdox `get_nested_value` should return the supplied default value if the requested key doesn't exist.
+	 *
+	 * @testWith ["foo"]
+	 *           ["foo::bar"]
+	 *
+	 * @param string $key The key to test.
+	 */
+	public function test_get_nested_value_returns_supplied_default_if_non_existing_key( $key ) {
+		$array  = array( 'fizz' => 'buzz' );
+		$actual = ArrayUtil::get_nested_value( $array, $key, 'DEFAULT' );
+
+		$this->assertEquals( 'DEFAULT', $actual );
+	}
+
+	/**
+	 * @testdox `get_nested_value` should return the proper value when a simple key is passed.
+	 */
+	public function test_get_nested_value_works_for_simple_keys() {
+		$array  = array( 'foo' => 'bar' );
+		$actual = ArrayUtil::get_nested_value( $array, 'foo' );
+
+		$this->assertEquals( 'bar', $actual );
+	}
+
+	/**
+	 * @testdox `get_nested_value` should return the proper value when a nested key is passed.
+	 */
+	public function test_get_nested_value_works_for_nested_keys() {
+		$array  = array(
+			'foo' => array(
+				'bar' => array(
+					'fizz' => 'buzz',
+				),
+			),
+		);
+		$actual = ArrayUtil::get_nested_value( $array, 'foo::bar::fizz' );
+
+		$this->assertEquals( 'buzz', $actual );
+	}
+
+	/**
+	 * @testdox `is_truthy` returns false when the key does not exist in the array.
+	 */
+	public function test_is_truthy_returns_false_if_key_does_not_exist() {
+		$array = array( 'foo' => 'bar' );
+
+		$this->assertFalse( ArrayUtil::is_truthy( $array, 'fizz' ) );
+	}
+
+	/**
+	 * @testdox `is_truthy` returns false for values that evaluate to false.
+	 *
+	 * @testWith [0]
+	 *           ["0"]
+	 *           [false]
+	 *           [""]
+	 *           [null]
+	 *           [[]]
+	 *
+	 * @param mixed $value Value to test.
+	 */
+	public function test_is_truthy_returns_false_if_value_evaluates_to_false( $value ) {
+		$array = array( 'foo' => $value );
+
+		$this->assertFalse( ArrayUtil::is_truthy( $array, 'foo' ) );
+	}
+
+	/**
+	 * @testdox `is_truthy` returns true for values that evaluate to true.
+	 *
+	 * @testWith [1]
+	 *           ["foo"]
+	 *           [true]
+	 *           [[1]]
+	 *
+	 * @param mixed $value Value to test.
+	 */
+	public function test_is_truthy_returns_false_if_value_evaluates_to_true( $value ) {
+		$array = array( 'foo' => $value );
+
+		$this->assertTrue( ArrayUtil::is_truthy( $array, 'foo' ) );
+	}
+
+	/**
+	 * @testdox `get_value_or_default` returns the correct value for an existing key.
+	 */
+	public function test_get_value_or_default_returns_value_if_key_exists() {
+		$array = array( 'foo' => 'bar' );
+
+		$this->assertEquals( 'bar', ArrayUtil::get_value_or_default( $array, 'foo' ) );
+	}
+
+	/**
+	 * @testdox `get_value_or_default` returns null if the key does not exist and no default value is supplied.
+	 */
+	public function test_get_value_or_default_returns_null_if_key_not_exists_and_no_default_supplied() {
+		$array = array( 'foo' => 'bar' );
+
+		$this->assertNull( ArrayUtil::get_value_or_default( $array, 'fizz' ) );
+	}
+
+	/**
+	 * @testdox `get_value_or_default` returns the supplied default value if the key does not exist.
+	 */
+	public function test_get_value_or_default_returns_supplied_default_value_if_key_not_exists() {
+		$array = array( 'foo' => 'bar' );
+
+		$this->assertEquals( 'buzz', ArrayUtil::get_value_or_default( $array, 'fizz', 'buzz' ) );
+	}
+}
diff --git a/woocommerce.php b/woocommerce.php
index 89d55866da5..1fb1516fb43 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce
  * Plugin URI: https://woocommerce.com/
  * Description: An eCommerce toolkit that helps you sell anything. Beautifully.
- * Version: 5.3.0-dev
+ * Version: 5.4.0-dev
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain: woocommerce