diff --git a/.github/workflows/smoke-test-daily.yml b/.github/workflows/smoke-test-daily.yml
index d168350f512..e859ad41ed3 100644
--- a/.github/workflows/smoke-test-daily.yml
+++ b/.github/workflows/smoke-test-daily.yml
@@ -39,5 +39,4 @@ jobs:
           E2E_SLACK_TOKEN: ${{ secrets.SMOKE_TEST_SLACK_TOKEN }}
           E2E_SLACK_CHANNEL: ${{ secrets.SMOKE_TEST_SLACK_CHANNEL }}
         run: |
-          npx wc-e2e docker:up
           npx wc-e2e test:e2e
diff --git a/.github/workflows/update-feedback-labels.yml b/.github/workflows/update-feedback-labels.yml
index b353c28032d..bb0af46f64b 100644
--- a/.github/workflows/update-feedback-labels.yml
+++ b/.github/workflows/update-feedback-labels.yml
@@ -20,3 +20,8 @@ jobs:
       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/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( /"/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..702b0ae1a19 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;
@@ -110,13 +110,13 @@
 
 		// Select all/none
 		$( '.woocommerce' ).on( 'click', '.select_all', function() {
-			$( this ).closest( 'td' ).find( 'select option' ).attr( 'selected', 'selected' );
+			$( this ).closest( 'td' ).find( 'select option' ).prop( 'selected', true );
 			$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 			return false;
 		});
 
 		$( '.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/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 00e9d902682..46a0467ff01 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -65,7 +65,7 @@ jQuery( function( $ ) {
 
 				$( 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/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 49cb11ee692..91ed6d34f63 100644
--- a/assets/js/select2/select2.full.js
+++ b/assets/js/select2/select2.full.js
@@ -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);
@@ -1591,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -2109,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3547,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();
       }
 
@@ -3572,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.'
@@ -3631,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);
@@ -3707,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;
@@ -3800,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;
@@ -4047,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);
     });
 
@@ -4063,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4878,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4941,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;
       }
 
@@ -5724,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();
       });
@@ -5801,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
@@ -5814,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
@@ -5855,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);
     }
 
@@ -5881,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);
     }
 
@@ -5912,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);
     }
 
@@ -5938,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);
     }
 
@@ -5985,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];
       }
 
@@ -6131,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;
       }
 
@@ -6374,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/select2/select2.js b/assets/js/select2/select2.js
index 3f27bbd4032..99431250b9a 100644
--- a/assets/js/select2/select2.js
+++ b/assets/js/select2/select2.js
@@ -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);
@@ -1591,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -2109,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3547,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();
       }
 
@@ -3572,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.'
@@ -3631,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);
@@ -3707,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;
@@ -3800,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;
@@ -4047,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);
     });
 
@@ -4063,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4878,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4941,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;
       }
 
@@ -5724,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/selectWoo/selectWoo.full.js b/assets/js/selectWoo/selectWoo.full.js
index 49cb11ee692..4c4daf83fc9 100644
--- a/assets/js/selectWoo/selectWoo.full.js
+++ b/assets/js/selectWoo/selectWoo.full.js
@@ -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);
       });
     });
@@ -1591,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1737,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);
     }
   }
@@ -2109,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3547,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();
       }
 
@@ -3572,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.'
@@ -3631,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);
@@ -3707,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;
@@ -3800,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;
@@ -4047,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);
     });
 
@@ -4063,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4878,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if (Array.isArray(options.language)) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4941,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;
       }
 
@@ -5513,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(){
@@ -5533,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' );
     }
   };
 
@@ -5724,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();
       });
@@ -5801,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
@@ -5814,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
@@ -5855,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);
     }
 
@@ -5881,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);
     }
 
@@ -5912,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);
     }
 
@@ -5938,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);
     }
 
@@ -5985,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];
       }
 
@@ -6131,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;
       }
 
@@ -6374,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 3f27bbd4032..1e894251667 100644
--- a/assets/js/selectWoo/selectWoo.js
+++ b/assets/js/selectWoo/selectWoo.js
@@ -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);
       });
     });
@@ -1591,7 +1591,7 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger( 'focus' );
       }
     });
 
@@ -1737,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);
     }
   }
@@ -2109,7 +2109,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger( 'focus' );
     }
   };
 
@@ -3547,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();
       }
 
@@ -3572,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.'
@@ -3631,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);
@@ -3707,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;
@@ -3800,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;
@@ -4047,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);
     });
 
@@ -4063,7 +4063,7 @@ S2.define('select2/dropdown/search',[
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger( 'focus' );
       }
     });
 
@@ -4878,7 +4878,7 @@ S2.define('select2/defaults',[
       }
     }
 
-    if ($.isArray(options.language)) {
+    if ( Array.isArray( options.language ) ) {
       var languages = new Translation();
       options.language.push('en');
 
@@ -4941,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;
       }
 
@@ -5513,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(){
@@ -5533,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' );
     }
   };
 
@@ -5724,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 6e9a52a1179..a5986e21761 100644
--- a/bin/composer/mozart/composer.lock
+++ b/bin/composer/mozart/composer.lock
@@ -267,16 +267,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
                 "shasum": ""
             },
             "require": {
@@ -344,7 +344,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.6"
+                "source": "https://github.com/symfony/console/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -360,20 +360,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-05-11T15:45:21+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.4",
+            "version": "v5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
+                "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
+                "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
                 "shasum": ""
             },
             "require": {
@@ -405,7 +405,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.4"
+                "source": "https://github.com/symfony/finder/tree/v5.2.9"
             },
             "funding": [
                 {
@@ -421,7 +421,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2021-05-16T13:07:46+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -911,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": ""
@@ -933,7 +933,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -970,7 +970,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/master"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -986,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.6",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
+                "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
                 "shasum": ""
             },
             "require": {
@@ -1053,7 +1053,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.2.6"
+                "source": "https://github.com/symfony/string/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -1069,7 +1069,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-17T17:12:15+00:00"
+            "time": "2021-05-10T14:56:10+00:00"
         }
     ],
     "aliases": [],
diff --git a/bin/composer/phpcs/composer.lock b/bin/composer/phpcs/composer.lock
index d784a60a0a0..e0653d55467 100644
--- a/bin/composer/phpcs/composer.lock
+++ b/bin/composer/phpcs/composer.lock
@@ -251,16 +251,16 @@
         },
         {
             "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": {
@@ -303,7 +303,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2020-10-23T02:01:07+00:00"
+            "time": "2021-04-09T00:54:41+00:00"
         },
         {
             "name": "woocommerce/woocommerce-sniffs",
diff --git a/bin/composer/wp/composer.lock b/bin/composer/wp/composer.lock
index 8fb33475e13..0674d3f98fa 100644
--- a/bin/composer/wp/composer.lock
+++ b/bin/composer/wp/composer.lock
@@ -155,16 +155,16 @@
         },
         {
             "name": "mck89/peast",
-            "version": "v1.12.0",
+            "version": "v1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mck89/peast.git",
-                "reference": "833be7a294627a8c5b1c482cbf489f73bf9b8086"
+                "reference": "db38b1524f5bda921cbda2385e440c2bb71d18b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mck89/peast/zipball/833be7a294627a8c5b1c482cbf489f73bf9b8086",
-                "reference": "833be7a294627a8c5b1c482cbf489f73bf9b8086",
+                "url": "https://api.github.com/repos/mck89/peast/zipball/db38b1524f5bda921cbda2385e440c2bb71d18b4",
+                "reference": "db38b1524f5bda921cbda2385e440c2bb71d18b4",
                 "shasum": ""
             },
             "require": {
@@ -176,7 +176,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12.0-dev"
+                    "dev-master": "1.13.0-dev"
                 }
             },
             "autoload": {
@@ -187,7 +187,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -198,9 +198,9 @@
             "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"
+                "source": "https://github.com/mck89/peast/tree/v1.13.0"
             },
-            "time": "2021-01-08T15:16:19+00:00"
+            "time": "2021-05-22T16:06:09+00:00"
         },
         {
             "name": "mustache/mustache",
@@ -254,23 +254,30 @@
         },
         {
             "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": {
@@ -289,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",
@@ -300,10 +307,10 @@
                 "sockets"
             ],
             "support": {
-                "issues": "https://github.com/rmccue/Requests/issues",
-                "source": "https://github.com/rmccue/Requests/tree/master"
+                "issues": "https://github.com/WordPress/Requests/issues",
+                "source": "https://github.com/WordPress/Requests/tree/v1.8.0"
             },
-            "time": "2016-10-13T00:11:37+00:00"
+            "time": "2021-04-27T11:05:25+00:00"
         },
         {
             "name": "symfony/finder",
@@ -359,26 +366,26 @@
         },
         {
             "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": {
@@ -414,9 +421,9 @@
             "homepage": "https://github.com/wp-cli/i18n-command",
             "support": {
                 "issues": "https://github.com/wp-cli/i18n-command/issues",
-                "source": "https://github.com/wp-cli/i18n-command/tree/v2.2.6"
+                "source": "https://github.com/wp-cli/i18n-command/tree/v2.2.8"
             },
-            "time": "2020-12-07T19:28:27+00:00"
+            "time": "2021-05-10T10:24:16+00:00"
         },
         {
             "name": "wp-cli/mustangostang-spyc",
@@ -525,23 +532,23 @@
         },
         {
             "name": "wp-cli/wp-cli",
-            "version": "v2.4.1",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/wp-cli.git",
-                "reference": "ceb18598e79befa9b2a37a51efbb34910628988b"
+                "reference": "0bcf0c54f4d35685211d435e25219cc7acbe6d48"
             },
             "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/0bcf0c54f4d35685211d435e25219cc7acbe6d48",
+                "reference": "0bcf0c54f4d35685211d435e25219cc7acbe6d48",
                 "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"
@@ -552,7 +559,7 @@
                 "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",
@@ -565,13 +572,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": [
@@ -588,7 +599,7 @@
                 "issues": "https://github.com/wp-cli/wp-cli/issues",
                 "source": "https://github.com/wp-cli/wp-cli"
             },
-            "time": "2020-02-18T08:15:37+00:00"
+            "time": "2021-05-14T13:44:51+00:00"
         }
     ],
     "aliases": [],
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 4b636018665..dc87ea85f2e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,136 @@
 == Changelog ==
 
+= 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**
diff --git a/composer.json b/composer.json
index 4daa8132829..08902a35e92 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.2.2",
-    "woocommerce/woocommerce-blocks": "4.9.1"
+    "woocommerce/woocommerce-admin": "2.3.1",
+    "woocommerce/woocommerce-blocks": "5.1.0"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.4"
diff --git a/composer.lock b/composer.lock
index 57039bbbbce..617eafc27ac 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": "a604678b268820c78736d599e1eb6726",
+    "content-hash": "cf10f974b24dd9a696708cc95a0e3d6e",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -51,6 +51,9 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Creates a custom autoloader for a plugin or theme.",
+            "support": {
+                "source": "https://github.com/Automattic/jetpack-autoloader/tree/2.10.1"
+            },
             "time": "2021-03-30T15:15:59+00:00"
         },
         {
@@ -82,6 +85,9 @@
                 "GPL-2.0-or-later"
             ],
             "description": "A wrapper for defining constants in a more testable way.",
+            "support": {
+                "source": "https://github.com/Automattic/jetpack-constants/tree/v1.5.1"
+            },
             "time": "2020-10-28T19:00:31+00:00"
         },
         {
@@ -214,6 +220,10 @@
                 "zend",
                 "zikula"
             ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v1.11.0"
+            },
             "funding": [
                 {
                     "url": "https://packagist.com",
@@ -288,6 +298,10 @@
                 "geolocation",
                 "maxmind"
             ],
+            "support": {
+                "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues",
+                "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.6.0"
+            },
             "time": "2019-12-19T22:59:03+00:00"
         },
         {
@@ -362,6 +376,10 @@
                 "email",
                 "pre-processing"
             ],
+            "support": {
+                "issues": "https://github.com/MyIntervals/emogrifier/issues",
+                "source": "https://github.com/MyIntervals/emogrifier"
+            },
             "time": "2019-12-26T19:37:31+00:00"
         },
         {
@@ -411,6 +429,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/master"
+            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -464,6 +486,9 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/css-selector/tree/master"
+            },
             "time": "2017-05-01T15:01:29+00:00"
         },
         {
@@ -499,20 +524,24 @@
             ],
             "description": "Action Scheduler for WordPress and WooCommerce",
             "homepage": "https://actionscheduler.org/",
+            "support": {
+                "issues": "https://github.com/woocommerce/action-scheduler/issues",
+                "source": "https://github.com/woocommerce/action-scheduler/tree/master"
+            },
             "time": "2020-05-12T16:22:33+00:00"
         },
         {
             "name": "woocommerce/woocommerce-admin",
-            "version": "2.2.2",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-admin.git",
-                "reference": "161e6afa01a3fb69533cfa2b245a71df7512ec3f"
+                "reference": "f28cf3f027e27a6679e4fa8173d8b6859ec84838"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/161e6afa01a3fb69533cfa2b245a71df7512ec3f",
-                "reference": "161e6afa01a3fb69533cfa2b245a71df7512ec3f",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/f28cf3f027e27a6679e4fa8173d8b6859ec84838",
+                "reference": "f28cf3f027e27a6679e4fa8173d8b6859ec84838",
                 "shasum": ""
             },
             "require": {
@@ -521,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"
             },
@@ -531,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": {
@@ -544,20 +576,24 @@
             ],
             "description": "A modern, javascript-driven WooCommerce Admin experience.",
             "homepage": "https://github.com/woocommerce/woocommerce-admin",
-            "time": "2021-04-29T14:11:48+00:00"
+            "support": {
+                "issues": "https://github.com/woocommerce/woocommerce-admin/issues",
+                "source": "https://github.com/woocommerce/woocommerce-admin/tree/v2.3.1"
+            },
+            "time": "2021-05-24T09:48:40+00:00"
         },
         {
             "name": "woocommerce/woocommerce-blocks",
-            "version": "v4.9.1",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-gutenberg-products-block.git",
-                "reference": "62f32bfb45dfcb2ba3ca349a6ed0a8cf48ddefce"
+                "reference": "a4f168596f3832e161b26dec636b69293039ee51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/62f32bfb45dfcb2ba3ca349a6ed0a8cf48ddefce",
-                "reference": "62f32bfb45dfcb2ba3ca349a6ed0a8cf48ddefce",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/a4f168596f3832e161b26dec636b69293039ee51",
+                "reference": "a4f168596f3832e161b26dec636b69293039ee51",
                 "shasum": ""
             },
             "require": {
@@ -565,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",
@@ -591,7 +627,11 @@
                 "gutenberg",
                 "woocommerce"
             ],
-            "time": "2021-04-13T16:11:16+00:00"
+            "support": {
+                "issues": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues",
+                "source": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/tree/v5.1.0"
+            },
+            "time": "2021-05-10T15:01:42+00:00"
         }
     ],
     "packages-dev": [
@@ -639,6 +679,10 @@
                 "isolation",
                 "tool"
             ],
+            "support": {
+                "issues": "https://github.com/bamarni/composer-bin-plugin/issues",
+                "source": "https://github.com/bamarni/composer-bin-plugin/tree/master"
+            },
             "time": "2020-05-03T08:27:20+00:00"
         }
     ],
@@ -654,5 +698,5 @@
     "platform-overrides": {
         "php": "7.0"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
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/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-notices.php b/includes/admin/class-wc-admin-notices.php
index fa9716cc498..b543c698472 100644
--- a/includes/admin/class-wc-admin-notices.php
+++ b/includes/admin/class-wc-admin-notices.php
@@ -67,44 +67,12 @@ class WC_Admin_Notices {
 	/**
 	 * Parses query to create nonces when available.
 	 *
+	 * @deprecated 5.4.0
 	 * @param object $response The WP_REST_Response we're working with.
 	 * @return object $response The prepared WP_REST_Response object.
 	 */
 	public static function prepare_note_with_nonce( $response ) {
-		if ( 'wc-update-db-reminder' !== $response->data['name'] || ! isset( $response->data['actions'] ) ) {
-			return $response;
-		}
-
-		foreach ( $response->data['actions'] as $action_key => $action ) {
-			$url_parts = ! empty( $action->query ) ? wp_parse_url( $action->query ) : '';
-
-			if ( ! isset( $url_parts['query'] ) ) {
-				continue;
-			}
-
-			wp_parse_str( $url_parts['query'], $params );
-
-			if ( array_key_exists( '_nonce_action', $params ) && array_key_exists( '_nonce_name', $params ) ) {
-				$org_params = $params;
-
-				// Check to make sure we're acting on the whitelisted nonce actions.
-				if ( 'wc_db_update' !== $params['_nonce_action'] && 'woocommerce_hide_notices_nonce' !== $params['_nonce_action'] ) {
-					continue;
-				}
-
-				unset( $org_params['_nonce_action'] );
-				unset( $org_params['_nonce_name'] );
-
-				$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $url_parts['path'];
-
-				$nonce         = array( $params['_nonce_name'] => wp_create_nonce( $params['_nonce_action'] ) );
-				$merged_params = array_merge( $nonce, $org_params );
-				$parsed_query  = add_query_arg( $merged_params, $url );
-
-				$response->data['actions'][ $action_key ]->query = $parsed_query;
-				$response->data['actions'][ $action_key ]->url   = $parsed_query;
-			}
-		}
+		wc_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '5.4.0' );
 
 		return $response;
 	}
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-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/list-tables/class-wc-admin-list-table-orders.php b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
index b2a0e511886..417f2819f1a 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-orders.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
@@ -454,6 +454,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 				'method_id',
 				'cost',
 				'_reduced_stock',
+				'_restock_refunded_items',
 			)
 		);
 
diff --git a/includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php b/includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php
index 84c93a2124f..08a828db82d 100644
--- a/includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php
+++ b/includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php
@@ -56,7 +56,7 @@ class WC_Marketplace_Suggestions {
 	}
 
 	/**
-	 * Render additional panels in the proudct data metabox.
+	 * Render additional panels in the product data metabox.
 	 */
 	public static function product_data_panels() {
 		include dirname( __FILE__ ) . '/templates/html-product-data-extensions.php';
diff --git a/includes/admin/meta-boxes/views/html-order-item-meta.php b/includes/admin/meta-boxes/views/html-order-item-meta.php
index ceb33b450a5..9056a957668 100644
--- a/includes/admin/meta-boxes/views/html-order-item-meta.php
+++ b/includes/admin/meta-boxes/views/html-order-item-meta.php
@@ -17,6 +17,7 @@ $hidden_order_itemmeta = apply_filters(
 		'method_id',
 		'cost',
 		'_reduced_stock',
+		'_restock_refunded_items',
 	)
 );
 ?><div class="view">
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/notes/class-wc-notes-run-db-update.php b/includes/admin/notes/class-wc-notes-run-db-update.php
index 1fad100ff9e..77017ec2ca2 100644
--- a/includes/admin/notes/class-wc-notes-run-db-update.php
+++ b/includes/admin/notes/class-wc-notes-run-db-update.php
@@ -109,24 +109,23 @@ class WC_Notes_Run_Db_Update {
 	 * @return int Created/Updated note id
 	 */
 	private static function update_needed_notice( $note_id = null ) {
-		$update_url = html_entity_decode(
+		$update_url =
 			add_query_arg(
 				array(
 					'do_update_woocommerce' => 'true',
-					'_nonce_action'         => 'wc_db_update',
-					'_nonce_name'           => 'wc_db_update_nonce',
 				),
 				wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' )
-			)
-		);
+			);
 
 		$note_actions = array(
 			array(
-				'name'    => 'update-db_run',
-				'label'   => __( 'Update WooCommerce Database', 'woocommerce' ),
-				'url'     => $update_url,
-				'status'  => 'unactioned',
-				'primary' => true,
+				'name'         => 'update-db_run',
+				'label'        => __( 'Update WooCommerce Database', 'woocommerce' ),
+				'url'          => $update_url,
+				'status'       => 'unactioned',
+				'primary'      => true,
+				'nonce_action' => 'wc_db_update',
+				'nonce_name'   => 'wc_db_update_nonce',
 			),
 			array(
 				'name'    => 'update-db_learn-more',
@@ -166,6 +165,10 @@ class WC_Notes_Run_Db_Update {
 		$note->clear_actions();
 		foreach ( $note_actions as $note_action ) {
 			$note->add_action( ...array_values( $note_action ) );
+
+			if ( isset( $note_action['nonce_action'] ) ) {
+				$note->add_nonce_to_action( $note_action['name'], $note_action['nonce_action'], $note_action['nonce_name'] );
+			}
 		}
 
 		return $note->save();
@@ -212,8 +215,6 @@ class WC_Notes_Run_Db_Update {
 			add_query_arg(
 				array(
 					'wc-hide-notice' => 'update',
-					'_nonce_action'  => 'woocommerce_hide_notices_nonce',
-					'_nonce_name'    => '_wc_notice_nonce',
 				),
 				wc_get_current_admin_url() ? remove_query_arg( 'do_update_woocommerce', wc_get_current_admin_url() ) : admin_url( 'admin.php?page=wc-settings' )
 			)
@@ -221,11 +222,13 @@ class WC_Notes_Run_Db_Update {
 
 		$note_actions = array(
 			array(
-				'name'    => 'update-db_done',
-				'label'   => __( 'Thanks!', 'woocommerce' ),
-				'url'     => $hide_notices_url,
-				'status'  => 'actioned',
-				'primary' => true,
+				'name'         => 'update-db_done',
+				'label'        => __( 'Thanks!', 'woocommerce' ),
+				'url'          => $hide_notices_url,
+				'status'       => 'actioned',
+				'primary'      => true,
+				'nonce_action' => 'woocommerce_hide_notices_nonce',
+				'nonce_name'   => '_wc_notice_nonce',
 			),
 		);
 
@@ -242,6 +245,10 @@ class WC_Notes_Run_Db_Update {
 		$note->clear_actions();
 		foreach ( $note_actions as $note_action ) {
 			$note->add_action( ...array_values( $note_action ) );
+
+			if ( isset( $note_action['nonce_action'] ) ) {
+				$note->add_nonce_to_action( $note_action['name'], $note_action['nonce_action'], $note_action['nonce_name'] );
+			}
 		}
 
 		$note->save();
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/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/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php
index 3131dd9ea05..d3d52963ae2 100644
--- a/includes/admin/wc-admin-functions.php
+++ b/includes/admin/wc-admin-functions.php
@@ -206,17 +206,19 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) {
 		return false;
 	}
 
-	$product               = $item->get_product();
-	$item_quantity         = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() );
-	$already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) );
+	$product = $item->get_product();
 
 	if ( ! $product || ! $product->managing_stock() ) {
 		return false;
 	}
 
+	$item_quantity          = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() );
+	$already_reduced_stock  = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) );
+	$restock_refunded_items = wc_stock_amount( $item->get_meta( '_restock_refunded_items', true ) );
 	$order                  = $item->get_order();
 	$refunded_item_quantity = $order->get_qty_refunded_for_item( $item->get_id() );
-	$diff                   = $item_quantity + $refunded_item_quantity - $already_reduced_stock;
+
+	$diff = $item_quantity - $restock_refunded_items - $already_reduced_stock;
 
 	/*
 	 * 0 as $item_quantity usually indicates we're deleting the order item.
@@ -238,7 +240,7 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) {
 		return $new_stock;
 	}
 
-	$item->update_meta_data( '_reduced_stock', $item_quantity + $refunded_item_quantity );
+	$item->update_meta_data( '_reduced_stock', $item_quantity - $restock_refunded_items );
 	$item->save();
 
 	if ( $item_quantity > 0 ) {
diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php
index b35d97d6590..67ee65b30b9 100644
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@@ -1002,6 +1002,8 @@ class WC_AJAX {
 			);
 
 			if ( strstr( $amount, '%' ) ) {
+				// We need to calculate totals first, so that $order->get_total() is correct.
+				$order->calculate_totals( false );
 				$formatted_amount = $amount;
 				$percent          = floatval( trim( $amount, '%' ) );
 				$amount           = $order->get_total() * ( $percent / 100 );
diff --git a/includes/class-wc-cache-helper.php b/includes/class-wc-cache-helper.php
index f07fca63eb0..4a9c0604eab 100644
--- a/includes/class-wc-cache-helper.php
+++ b/includes/class-wc-cache-helper.php
@@ -42,14 +42,33 @@ class WC_Cache_Helper {
 	 */
 	public static function additional_nocache_headers( $headers ) {
 		$agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+
+		$set_cache = false;
+
 		/**
 		 * Allow plugins to enable nocache headers. Enabled for Google weblight.
 		 *
-		 * @see   https://support.google.com/webmasters/answer/1061943?hl=en
 		 * @param bool $enable_nocache_headers Flag indicating whether to add nocache headers. Default: false.
 		 */
-		if ( false !== strpos( $agent, 'googleweblight' ) || apply_filters( 'woocommerce_enable_nocache_headers', false ) ) {
+		if ( apply_filters( 'woocommerce_enable_nocache_headers', false ) ) {
+			$set_cache = true;
+		}
+
+		/**
+		 * Enabled for Google weblight.
+		 *
+		 * @see https://support.google.com/webmasters/answer/1061943?hl=en
+		 */
+		if ( false !== strpos( $agent, 'googleweblight' ) ) {
 			// no-transform: Opt-out of Google weblight. https://support.google.com/webmasters/answer/6211428?hl=en.
+			$set_cache = true;
+		}
+
+		if ( false !== strpos( $agent, 'Chrome' ) && is_cart() ) {
+			$set_cache = true;
+		}
+
+		if ( $set_cache ) {
 			$headers['Cache-Control'] = 'no-transform, no-cache, no-store, must-revalidate';
 		}
 		return $headers;
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 594bb904670..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 );
 	}
 
 	/**
diff --git a/includes/class-wc-checkout.php b/includes/class-wc-checkout.php
index 036c4ba612c..3133be81505 100644
--- a/includes/class-wc-checkout.php
+++ b/includes/class-wc-checkout.php
@@ -679,6 +679,8 @@ class WC_Checkout {
 		// phpcs:enable WordPress.Security.NonceVerification.Missing
 
 		$skipped = array();
+		$form_was_shown = isset( $_POST['woocommerce-process-checkout-nonce'] ); // phpcs:disable WordPress.Security.NonceVerification.Missing
+
 		foreach ( $this->get_checkout_fields() as $fieldset_key => $fieldset ) {
 			if ( $this->maybe_skip_fieldset( $fieldset_key, $data ) ) {
 				$skipped[] = $fieldset_key;
@@ -688,25 +690,32 @@ class WC_Checkout {
 			foreach ( $fieldset as $key => $field ) {
 				$type = sanitize_title( isset( $field['type'] ) ? $field['type'] : 'text' );
 
-				// phpcs:disable WordPress.Security.NonceVerification.Missing
-				switch ( $type ) {
-					case 'checkbox':
-						$value = isset( $_POST[ $key ] ) ? 1 : '';
-						break;
-					case 'multiselect':
-						$value = isset( $_POST[ $key ] ) ? implode( ', ', wc_clean( wp_unslash( $_POST[ $key ] ) ) ) : '';
-						break;
-					case 'textarea':
-						$value = isset( $_POST[ $key ] ) ? wc_sanitize_textarea( wp_unslash( $_POST[ $key ] ) ) : '';
-						break;
-					case 'password':
-						$value = isset( $_POST[ $key ] ) ? wp_unslash( $_POST[ $key ] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-						break;
-					default:
-						$value = isset( $_POST[ $key ] ) ? wc_clean( wp_unslash( $_POST[ $key ] ) ) : '';
-						break;
+				if ( isset( $_POST[ $key ] ) && '' !== $_POST[ $key ] ) { // phpcs:disable WordPress.Security.NonceVerification.Missing
+					$value = wp_unslash( $_POST[ $key ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+				} elseif ( isset( $field['default'] ) && 'checkbox' !== $type && ! $form_was_shown ) {
+					$value = $field['default'];
+				} else {
+					$value = '';
+				}
+
+				if ( '' !== $value ) {
+					switch ( $type ) {
+						case 'checkbox':
+							$value = 1;
+							break;
+						case 'multiselect':
+							$value = implode( ', ', wc_clean( $value ) );
+							break;
+						case 'textarea':
+							$value = wc_sanitize_textarea( $value );
+							break;
+						case 'password':
+							break;
+						default:
+							$value = wc_clean( $value );
+							break;
+					}
 				}
-				// phpcs:enable WordPress.Security.NonceVerification.Missing
 
 				$data[ $key ] = apply_filters( 'woocommerce_process_checkout_' . $type . '_field', apply_filters( 'woocommerce_process_checkout_field_' . $key, $value ) );
 			}
@@ -1123,7 +1132,7 @@ class WC_Checkout {
 	 */
 	public function process_checkout() {
 		try {
-			$nonce_value = wc_get_var( $_REQUEST['woocommerce-process-checkout-nonce'], wc_get_var( $_REQUEST['_wpnonce'], '' ) ); // @codingStandardsIgnoreLine.
+			$nonce_value = wc_get_var( $_REQUEST['woocommerce-process-checkout-nonce'], wc_get_var( $_REQUEST['_wpnonce'], '' ) ); // phpcs:ignore
 
 			if ( empty( $nonce_value ) || ! wp_verify_nonce( $nonce_value, 'woocommerce-process_checkout' ) ) {
 				WC()->session->set( 'refresh_totals', true );
diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php
index 064f035cabc..5d405c6523d 100644
--- a/includes/class-wc-countries.php
+++ b/includes/class-wc-countries.php
@@ -365,7 +365,7 @@ class WC_Countries {
 	 * @return string[]
 	 */
 	public function get_european_union_countries( $type = '' ) {
-		$countries = array( 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HU', 'HR', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK' );
+		$countries = array( 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK' );
 
 		if ( 'eu_vat' === $type ) {
 			$countries[] = 'MC';
@@ -383,7 +383,7 @@ class WC_Countries {
 	 */
 	public function countries_using_vat() {
 		wc_deprecated_function( 'countries_using_vat', '4.0', 'WC_Countries::get_vat_countries' );
-		$countries = array( 'AL', 'AR', 'AZ', 'BS', 'BH', 'BY', 'BB', 'BO', 'EG', 'ET', 'CL', 'CO', 'EC', 'SV', 'FJ', 'GM', 'GH', 'GT', 'IN', 'IR', 'IL', 'KZ', 'MU', 'MK', 'MX', 'MD', 'MN', 'ME', 'NA', 'NP', 'NG', 'PS', 'PY', 'RU', 'RW', 'KN', 'SA', 'RS', 'ZA', 'KR', 'LK', 'TH', 'TR', 'UA', 'UY', 'UZ', 'VE', 'VN', 'AE' );
+		$countries = array( 'AE', 'AL', 'AR', 'AZ', 'BB', 'BH', 'BO', 'BS', 'BY', 'CL', 'CO', 'EC', 'EG', 'ET', 'FJ', 'GH', 'GM', 'GT', 'IL', 'IN', 'IR', 'KN', 'KR', 'KZ', 'LK', 'MD', 'ME', 'MK', 'MN', 'MU', 'MX', 'NA', 'NG', 'NP', 'PS', 'PY', 'RS', 'RU', 'RW', 'SA', 'SV', 'TH', 'TR', 'UA', 'UY', 'UZ', 'VE', 'VN', 'ZA' );
 
 		return apply_filters( 'woocommerce_countries_using_vat', $countries );
 	}
@@ -409,7 +409,7 @@ class WC_Countries {
 	 */
 	public function shipping_to_prefix( $country_code = '' ) {
 		$country_code = $country_code ? $country_code : WC()->customer->get_shipping_country();
-		$countries    = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
+		$countries    = array( 'AE', 'CZ', 'DO', 'GB', 'NL', 'PH', 'US', 'USAF' );
 		$return       = in_array( $country_code, $countries, true ) ? __( 'to the', 'woocommerce' ) : __( 'to', 'woocommerce' );
 
 		return apply_filters( 'woocommerce_countries_shipping_to_prefix', $return, $country_code );
@@ -423,7 +423,7 @@ class WC_Countries {
 	 */
 	public function estimated_for_prefix( $country_code = '' ) {
 		$country_code = $country_code ? $country_code : $this->get_base_country();
-		$countries    = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' );
+		$countries    = array( 'AE', 'CZ', 'DO', 'GB', 'NL', 'PH', 'US', 'USAF' );
 		$return       = in_array( $country_code, $countries, true ) ? __( 'the', 'woocommerce' ) . ' ' : '';
 
 		return apply_filters( 'woocommerce_countries_estimated_for_prefix', $return, $country_code );
@@ -510,8 +510,8 @@ class WC_Countries {
 				'woocommerce_localisation_address_formats',
 				array(
 					'default' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}\n{postcode}\n{country}",
-					'AU'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}",
 					'AT'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'AU'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}",
 					'BE'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'CA'      => "{company}\n{name}\n{address_1}\n{address_2}\n{city} {state_code} {postcode}\n{country}",
 					'CH'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
@@ -519,9 +519,10 @@ class WC_Countries {
 					'CN'      => "{country} {postcode}\n{state}, {city}, {address_2}, {address_1}\n{company}\n{name}",
 					'CZ'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'DE'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'EE'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'FI'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'DK'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'EE'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'ES'      => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{state}\n{country}",
+					'FI'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'FR'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city_upper}\n{country}",
 					'HK'      => "{company}\n{first_name} {last_name_upper}\n{address_1}\n{address_2}\n{city_upper}\n{state_upper}\n{country}",
 					'HU'      => "{last_name} {first_name}\n{company}\n{city}\n{address_1}\n{address_2}\n{postcode}\n{country}",
@@ -530,20 +531,19 @@ class WC_Countries {
 					'IT'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode}\n{city}\n{state_upper}\n{country}",
 					'JM'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}\n{postcode_upper}\n{country}",
 					'JP'      => "{postcode}\n{state} {city} {address_1}\n{address_2}\n{company}\n{last_name} {first_name}\n{country}",
-					'TW'      => "{company}\n{last_name} {first_name}\n{address_1}\n{address_2}\n{state}, {city} {postcode}\n{country}",
 					'LI'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'NL'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'NZ'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {postcode}\n{country}",
 					'NO'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'NZ'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {postcode}\n{country}",
 					'PL'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'PR'      => "{company}\n{name}\n{address_1} {address_2}\n{city} \n{country} {postcode}",
 					'PT'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'SK'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'RS'      => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'SI'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
-					'ES'      => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{state}\n{country}",
 					'SE'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'SI'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
+					'SK'      => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}",
 					'TR'      => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city} {state}\n{country}",
+					'TW'      => "{company}\n{last_name} {first_name}\n{address_1}\n{address_2}\n{state}, {city} {postcode}\n{country}",
 					'UG'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}, {country}",
 					'US'      => "{name}\n{company}\n{address_1}\n{address_2}\n{city}, {state_code} {postcode}\n{country}",
 					'VN'      => "{name}\n{company}\n{address_1}\n{city}\n{country}",
@@ -937,6 +937,15 @@ class WC_Countries {
 							'required' => false,
 						),
 					),
+					'CW' => array(
+						'postcode' => array(
+							'required' => false,
+							'hidden'   => true,
+						),
+						'state'    => array(
+							'required' => false,
+						),
+					),
 					'CZ' => array(
 						'state' => array(
 							'required' => false,
diff --git a/includes/class-wc-install.php b/includes/class-wc-install.php
index 93ab40b0278..8ec6a5755a1 100644
--- a/includes/class-wc-install.php
+++ b/includes/class-wc-install.php
@@ -619,9 +619,11 @@ class WC_Install {
 		add_option( 'woocommerce_checkout_highlight_required_fields', 'yes', '', 'yes' );
 		add_option( 'woocommerce_demo_store', 'no', '', 'no' );
 
-		// Define initial tax classes.
-		WC_Tax::create_tax_class( __( 'Reduced rate', 'woocommerce' ) );
-		WC_Tax::create_tax_class( __( 'Zero rate', 'woocommerce' ) );
+		if ( self::is_new_install() ) {
+			// Define initial tax classes.
+			WC_Tax::create_tax_class( __( 'Reduced rate', 'woocommerce' ) );
+			WC_Tax::create_tax_class( __( 'Zero rate', 'woocommerce' ) );
+		}
 	}
 
 	/**
@@ -1332,7 +1334,12 @@ CREATE TABLE {$wpdb->prefix}wc_reserved_stock (
 			'post_content'   => '',
 			'post_status'    => 'inherit',
 		);
-		$attach_id  = wp_insert_attachment( $attachment, $filename );
+
+		$attach_id = wp_insert_attachment( $attachment, $filename );
+		if ( is_wp_error( $attach_id ) ) {
+			update_option( 'woocommerce_placeholder_image', 0 );
+			return;
+		}
 
 		update_option( 'woocommerce_placeholder_image', $attach_id );
 
diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php
index aabd27432c1..4541c40c582 100644
--- a/includes/class-wc-post-types.php
+++ b/includes/class-wc-post-types.php
@@ -92,19 +92,22 @@ class WC_Post_Types {
 					'update_count_callback' => '_wc_term_recount',
 					'label'                 => __( 'Categories', 'woocommerce' ),
 					'labels'                => array(
-						'name'              => __( 'Product categories', 'woocommerce' ),
-						'singular_name'     => __( 'Category', 'woocommerce' ),
-						'menu_name'         => _x( 'Categories', 'Admin menu name', 'woocommerce' ),
-						'search_items'      => __( 'Search categories', 'woocommerce' ),
-						'all_items'         => __( 'All categories', 'woocommerce' ),
-						'parent_item'       => __( 'Parent category', 'woocommerce' ),
-						'parent_item_colon' => __( 'Parent category:', 'woocommerce' ),
-						'edit_item'         => __( 'Edit category', 'woocommerce' ),
-						'update_item'       => __( 'Update category', 'woocommerce' ),
-						'add_new_item'      => __( 'Add new category', 'woocommerce' ),
-						'new_item_name'     => __( 'New category name', 'woocommerce' ),
-						'not_found'         => __( 'No categories found', 'woocommerce' ),
+						'name'                  => __( 'Product categories', 'woocommerce' ),
+						'singular_name'         => __( 'Category', 'woocommerce' ),
+						'menu_name'             => _x( 'Categories', 'Admin menu name', 'woocommerce' ),
+						'search_items'          => __( 'Search categories', 'woocommerce' ),
+						'all_items'             => __( 'All categories', 'woocommerce' ),
+						'parent_item'           => __( 'Parent category', 'woocommerce' ),
+						'parent_item_colon'     => __( 'Parent category:', 'woocommerce' ),
+						'edit_item'             => __( 'Edit category', 'woocommerce' ),
+						'update_item'           => __( 'Update category', 'woocommerce' ),
+						'add_new_item'          => __( 'Add new category', 'woocommerce' ),
+						'new_item_name'         => __( 'New category name', 'woocommerce' ),
+						'not_found'             => __( 'No categories found', 'woocommerce' ),
+						'item_link'             => __( 'Product Category Link', 'woocommerce' ),
+						'item_link_description' => __( 'A link to a product category.', 'woocommerce' ),
 					),
+					'show_in_rest'          => true,
 					'show_ui'               => true,
 					'query_var'             => true,
 					'capabilities'          => array(
@@ -146,7 +149,10 @@ class WC_Post_Types {
 						'add_or_remove_items'        => __( 'Add or remove tags', 'woocommerce' ),
 						'choose_from_most_used'      => __( 'Choose from the most used tags', 'woocommerce' ),
 						'not_found'                  => __( 'No tags found', 'woocommerce' ),
+						'item_link'                  => __( 'Product Tag Link', 'woocommerce' ),
+						'item_link_description'      => __( 'A link to a product tag.', 'woocommerce' ),
 					),
+					'show_in_rest'          => true,
 					'show_ui'               => true,
 					'query_var'             => true,
 					'capabilities'          => array(
@@ -335,6 +341,8 @@ class WC_Post_Types {
 						'filter_items_list'     => __( 'Filter products', 'woocommerce' ),
 						'items_list_navigation' => __( 'Products navigation', 'woocommerce' ),
 						'items_list'            => __( 'Products list', 'woocommerce' ),
+						'item_link'             => __( 'Product Link', 'woocommerce' ),
+						'item_link_description' => __( 'A link to a product.', 'woocommerce' ),
 					),
 					'description'         => __( 'This is where you can add new products to your store.', 'woocommerce' ),
 					'public'              => true,
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 8c74c11fd5b..c75a69cf2c9 100644
--- a/includes/class-woocommerce.php
+++ b/includes/class-woocommerce.php
@@ -9,7 +9,9 @@
 defined( 'ABSPATH' ) || exit;
 
 use Automattic\WooCommerce\Internal\DownloadPermissionsAdjuster;
+use Automattic\WooCommerce\Internal\RestockRefundedItemsAdjuster;
 use Automattic\WooCommerce\Internal\AssignDefaultCategory;
+use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 
 /**
@@ -24,7 +26,7 @@ final class WooCommerce {
 	 *
 	 * @var string
 	 */
-	public $version = '5.3.0';
+	public $version = '5.5.0';
 
 	/**
 	 * WooCommerce Schema version.
@@ -204,13 +206,27 @@ final class WooCommerce {
 		add_action( 'switch_blog', array( $this, 'wpdb_table_fix' ), 0 );
 		add_action( 'activated_plugin', array( $this, 'activated_plugin' ) );
 		add_action( 'deactivated_plugin', array( $this, 'deactivated_plugin' ) );
-		add_filter( 'woocommerce_rest_prepare_note', array( 'WC_Admin_Notices', 'prepare_note_with_nonce' ) );
+		add_action( 'woocommerce_installed', array( $this, 'add_woocommerce_inbox_variant' ) );
+		add_action( 'woocommerce_updated', array( $this, 'add_woocommerce_inbox_variant' ) );
 
 		// 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 );
+		wc_get_container()->get( RestockRefundedItemsAdjuster::class );
 	}
 
+	/**
+	 * Add woocommerce_inbox_variant for the Remote Inbox Notification.
+	 *
+	 * P2 post can be found at https://wp.me/paJDYF-1uJ.
+	 */
+	public function add_woocommerce_inbox_variant() {
+		$config_name = 'woocommerce_inbox_variant_assignment';
+		if ( false === get_option( $config_name, false ) ) {
+			update_option( $config_name, wp_rand( 1, 12 ) );
+		}
+	}
 	/**
 	 * Ensures fatal errors are logged so they can be picked up in the status report.
 	 *
diff --git a/includes/customizer/class-wc-shop-customizer.php b/includes/customizer/class-wc-shop-customizer.php
index f17cac7dfea..2170ff6d210 100644
--- a/includes/customizer/class-wc-shop-customizer.php
+++ b/includes/customizer/class-wc-shop-customizer.php
@@ -6,8 +6,6 @@
  * @package WooCommerce
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -15,19 +13,10 @@ 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 );
@@ -128,7 +117,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 ) {
@@ -556,11 +545,11 @@ class WC_Shop_Customizer {
 			)
 		);
 
-		if ( ! $this->theme_support->has_option( 'single_image_width', false ) ) {
+		if ( ! wc_get_theme_support( 'single_image_width' ) ) {
 			$wp_customize->add_setting(
 				'woocommerce_single_image_width',
 				array(
-					'default'              => $this->theme_support->get_option( 'single_image_width', 600 ),
+					'default'              => 600,
 					'type'                 => 'option',
 					'capability'           => 'manage_woocommerce',
 					'sanitize_callback'    => 'absint',
@@ -584,11 +573,11 @@ class WC_Shop_Customizer {
 			);
 		}
 
-		if ( ! $this->theme_support->has_option( 'thumbnail_image_width', false ) ) {
+		if ( ! wc_get_theme_support( 'thumbnail_image_width' ) ) {
 			$wp_customize->add_setting(
 				'woocommerce_thumbnail_image_width',
 				array(
-					'default'              => $this->theme_support->get_option( 'thumbnail_image_width', 300 ),
+					'default'              => 300,
 					'type'                 => 'option',
 					'capability'           => 'manage_woocommerce',
 					'sanitize_callback'    => 'absint',
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/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/gateways/paypal/includes/settings-paypal.php b/includes/gateways/paypal/includes/settings-paypal.php
index d9d56ddaadf..53729429e8e 100644
--- a/includes/gateways/paypal/includes/settings-paypal.php
+++ b/includes/gateways/paypal/includes/settings-paypal.php
@@ -58,7 +58,7 @@ return array(
 		'description' => sprintf( __( 'Log PayPal events, such as IPN requests, inside %s Note: this may log personal information. We recommend using this for debugging purposes only and deleting the logs when finished.', 'woocommerce' ), '<code>' . WC_Log_Handler_File::get_log_file_path( 'paypal' ) . '</code>' ),
 	),
 	'ipn_notification'      => array(
-		'title'       => __( 'IPN Email Notifications', 'woocommerce' ),
+		'title'       => __( 'IPN email notifications', 'woocommerce' ),
 		'type'        => 'checkbox',
 		'label'       => __( 'Enable IPN email notifications', 'woocommerce' ),
 		'default'     => 'yes',
diff --git a/includes/rest-api/Controllers/Version2/class-wc-rest-products-v2-controller.php b/includes/rest-api/Controllers/Version2/class-wc-rest-products-v2-controller.php
index 2e80879f194..4927dc37f1b 100644
--- a/includes/rest-api/Controllers/Version2/class-wc-rest-products-v2-controller.php
+++ b/includes/rest-api/Controllers/Version2/class-wc-rest-products-v2-controller.php
@@ -640,7 +640,7 @@ class WC_REST_Products_V2_Controller extends WC_REST_CRUD_Controller {
 		 *
 		 *  TODO: Refactor to fix this behavior when DI gets included to make it obvious and clean.
 		*/
-		$request = func_num_args() >= 2 ? func_get_arg( 2 ) : new WP_REST_Request( '', '', array( 'context' => $context ) );
+		$request = func_num_args() >= 3 ? func_get_arg( 2 ) : new WP_REST_Request( '', '', array( 'context' => $context ) );
 		$fields  = $this->get_fields_for_response( $request );
 
 		$base_data = array();
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..310bd2367e0 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'][0]['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/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 db598f78907..fb06a7a84dc 100644
--- a/includes/theme-support/class-wc-twenty-eleven.php
+++ b/includes/theme-support/class-wc-twenty-eleven.php
@@ -6,8 +6,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -31,7 +29,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 a3a194c7579..83e1930cf93 100644
--- a/includes/theme-support/class-wc-twenty-fifteen.php
+++ b/includes/theme-support/class-wc-twenty-fifteen.php
@@ -7,8 +7,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -32,7 +30,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 b8f5cf09a6b..ce04395299d 100644
--- a/includes/theme-support/class-wc-twenty-fourteen.php
+++ b/includes/theme-support/class-wc-twenty-fourteen.php
@@ -7,8 +7,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -32,7 +30,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 5419ade5b0a..9d1f44cc64c 100644
--- a/includes/theme-support/class-wc-twenty-nineteen.php
+++ b/includes/theme-support/class-wc-twenty-nineteen.php
@@ -7,7 +7,6 @@
  */
 
 use Automattic\Jetpack\Constants;
-use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -38,7 +37,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			array(
 				'thumbnail_image_width' => 300,
 				'single_image_width'    => 450,
diff --git a/includes/theme-support/class-wc-twenty-seventeen.php b/includes/theme-support/class-wc-twenty-seventeen.php
index 661121063a5..2093d2200e7 100644
--- a/includes/theme-support/class-wc-twenty-seventeen.php
+++ b/includes/theme-support/class-wc-twenty-seventeen.php
@@ -7,7 +7,6 @@
  */
 
 use Automattic\Jetpack\Constants;
-use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -31,7 +30,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 f78fbb634f5..c9681fa5e98 100644
--- a/includes/theme-support/class-wc-twenty-sixteen.php
+++ b/includes/theme-support/class-wc-twenty-sixteen.php
@@ -6,8 +6,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -31,7 +29,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 4988aea16a4..8a9262e6191 100644
--- a/includes/theme-support/class-wc-twenty-ten.php
+++ b/includes/theme-support/class-wc-twenty-ten.php
@@ -6,8 +6,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -31,7 +29,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 527fa176ee0..4e80b3e27c6 100644
--- a/includes/theme-support/class-wc-twenty-thirteen.php
+++ b/includes/theme-support/class-wc-twenty-thirteen.php
@@ -7,8 +7,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -32,7 +30,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 3815ac4c26d..116dabea432 100644
--- a/includes/theme-support/class-wc-twenty-twelve.php
+++ b/includes/theme-support/class-wc-twenty-twelve.php
@@ -7,8 +7,6 @@
  * @package WooCommerce\Classes
  */
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -32,7 +30,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 7707c05ecd5..6b568ae0e2d 100644
--- a/includes/theme-support/class-wc-twenty-twenty-one.php
+++ b/includes/theme-support/class-wc-twenty-twenty-one.php
@@ -7,7 +7,6 @@
  */
 
 use Automattic\Jetpack\Constants;
-use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -38,7 +37,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			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 862376f9eda..47296f639ab 100644
--- a/includes/theme-support/class-wc-twenty-twenty.php
+++ b/includes/theme-support/class-wc-twenty-twenty.php
@@ -7,7 +7,6 @@
  */
 
 use Automattic\Jetpack\Constants;
-use Automattic\WooCommerce\Internal\ThemeSupport;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -38,7 +37,8 @@ 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' );
-		wc_get_container()->get( ThemeSupport::class )->add_default_options(
+		add_theme_support(
+			'woocommerce',
 			array(
 				'thumbnail_image_width' => 450,
 				'single_image_width'    => 600,
diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php
index 63ff71103cc..d0298871e68 100644
--- a/includes/wc-core-functions.php
+++ b/includes/wc-core-functions.php
@@ -9,7 +9,6 @@
  */
 
 use Automattic\Jetpack\Constants;
-use Automattic\WooCommerce\Internal\ThemeSupport;
 use Automattic\WooCommerce\Utilities\NumberUtil;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -880,7 +879,38 @@ 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 ) {
-	return wc_get_container()->get( ThemeSupport::class )->get_option( $prop, $default );
+	$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;
 }
 
 /**
@@ -1821,7 +1851,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 );
@@ -2413,7 +2443,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-order-functions.php b/includes/wc-order-functions.php
index a17bae8244a..10141d3a8a7 100644
--- a/includes/wc-order-functions.php
+++ b/includes/wc-order-functions.php
@@ -700,9 +700,10 @@ function wc_restock_refunded_items( $order, $refunded_line_items ) {
 		if ( ! isset( $refunded_line_items[ $item_id ], $refunded_line_items[ $item_id ]['qty'] ) ) {
 			continue;
 		}
-		$product            = $item->get_product();
-		$item_stock_reduced = $item->get_meta( '_reduced_stock', true );
-		$qty_to_refund      = $refunded_line_items[ $item_id ]['qty'];
+		$product                = $item->get_product();
+		$item_stock_reduced     = $item->get_meta( '_reduced_stock', true );
+		$restock_refunded_items = (int) $item->get_meta( '_restock_refunded_items', true );
+		$qty_to_refund          = $refunded_line_items[ $item_id ]['qty'];
 
 		if ( ! $item_stock_reduced || ! $qty_to_refund || ! $product || ! $product->managing_stock() ) {
 			continue;
@@ -715,9 +716,14 @@ function wc_restock_refunded_items( $order, $refunded_line_items ) {
 		$item_stock_reduced = $item_stock_reduced - $qty_to_refund;
 
 		if ( 0 < $item_stock_reduced ) {
+			// Keeps track of total running tally of reduced stock.
 			$item->update_meta_data( '_reduced_stock', $item_stock_reduced );
+
+			// Keeps track of only refunded items that needs restock.
+			$item->update_meta_data( '_restock_refunded_items', $qty_to_refund + $restock_refunded_items );
 		} else {
 			$item->delete_meta_data( '_reduced_stock' );
+			$item->delete_meta_data( '_restock_refunded_items' );
 		}
 
 		/* translators: 1: product ID 2: old stock level 3: new stock level */
diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php
index 6f79b88edcd..e72711f175d 100644
--- a/includes/widgets/class-wc-widget-layered-nav.php
+++ b/includes/widgets/class-wc-widget-layered-nav.php
@@ -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/includes/widgets/class-wc-widget-products.php b/includes/widgets/class-wc-widget-products.php
index be373488920..a40c7028408 100644
--- a/includes/widgets/class-wc-widget-products.php
+++ b/includes/widgets/class-wc-widget-products.php
@@ -20,7 +20,7 @@ class WC_Widget_Products extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_products';
 		$this->widget_description = __( "A list of your store's products.", 'woocommerce' );
 		$this->widget_id          = 'woocommerce_products';
-		$this->widget_name        = __( 'Products', 'woocommerce' );
+		$this->widget_name        = __( 'Products list', 'woocommerce' );
 		$this->settings           = array(
 			'title'       => array(
 				'type'  => 'text',
@@ -186,6 +186,8 @@ class WC_Widget_Products extends WC_Widget {
 
 		ob_start();
 
+		wc_set_loop_prop( 'name', 'widget' );
+
 		$products = $this->get_products( $args, $instance );
 		if ( $products && $products->have_posts() ) {
 			$this->widget_start( $args, $instance );
diff --git a/includes/widgets/class-wc-widget-recently-viewed.php b/includes/widgets/class-wc-widget-recently-viewed.php
index e023927f6aa..e2b50ce581a 100644
--- a/includes/widgets/class-wc-widget-recently-viewed.php
+++ b/includes/widgets/class-wc-widget-recently-viewed.php
@@ -20,7 +20,7 @@ class WC_Widget_Recently_Viewed extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_recently_viewed_products';
 		$this->widget_description = __( "Display a list of a customer's recently viewed products.", 'woocommerce' );
 		$this->widget_id          = 'woocommerce_recently_viewed_products';
-		$this->widget_name        = __( 'Recent Viewed Products', 'woocommerce' );
+		$this->widget_name        = __( 'Recently Viewed Products list', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
diff --git a/includes/widgets/class-wc-widget-top-rated-products.php b/includes/widgets/class-wc-widget-top-rated-products.php
index a5241ece94c..e6d95bf17db 100644
--- a/includes/widgets/class-wc-widget-top-rated-products.php
+++ b/includes/widgets/class-wc-widget-top-rated-products.php
@@ -21,7 +21,7 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
 		$this->widget_cssclass    = 'woocommerce widget_top_rated_products';
 		$this->widget_description = __( "A list of your store's top-rated products.", 'woocommerce' );
 		$this->widget_id          = 'woocommerce_top_rated_products';
-		$this->widget_name        = __( 'Products by Rating', 'woocommerce' );
+		$this->widget_name        = __( 'Products by Rating list', 'woocommerce' );
 		$this->settings           = array(
 			'title'  => array(
 				'type'  => 'text',
diff --git a/package-lock.json b/package-lock.json
index 9358ea03b15..92b593f6ebb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce",
-  "version": "5.3.0",
+  "version": "5.5.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": {
@@ -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..3c9b50a16e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "woocommerce",
   "title": "WooCommerce",
-  "version": "5.3.0",
+  "version": "5.5.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 6c7b73bf3ba..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.2.2
+Stable tag: 5.3.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -160,167 +160,135 @@ WooCommerce comes with some sample data you can use to see how products look; im
 
 == Changelog ==
 
-= 5.2.2 2021-04-15 =
+= 5.3.0 2021-05-11 =
 
 **WooCommerce**
 
-* Fix - Can't grant permission for download from order details page. #29691
+* 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
 
-= 5.2.1 2021-04-14 =
+** WooCommerce Blocks - 4.8.0 & 4.9.0 & 4.9.1 **
 
-**WooCommerce**
+* 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
 
-* 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**
-
-* 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 - "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 & 2.1.4 & 2.1.5**
-
-* 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
+** 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 - Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
+* 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 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 & 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))
-* 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 a9291a6de5a..b0b99b94e14 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -8,8 +8,9 @@ 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;
+use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\RestockRefundedItemsAdjusterServiceProvider;
 
 /**
  * PSR11 compliant dependency injection container for WooCommerce.
@@ -35,10 +36,11 @@ final class Container implements \Psr\Container\ContainerInterface {
 	 * @var string[]
 	 */
 	private $service_providers = array(
-		ProxiesServiceProvider::class,
-		ThemeManagementServiceProvider::class,
-		DownloadPermissionsAdjusterServiceProvider::class,
 		AssignDefaultCategoryServiceProvider::class,
+		DownloadPermissionsAdjusterServiceProvider::class,
+		ProductAttributesLookupServiceProvider::class,
+		ProxiesServiceProvider::class,
+		RestockRefundedItemsAdjusterServiceProvider::class,
 	);
 
 	/**
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/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/RestockRefundedItemsAdjusterServiceProvider.php
similarity index 51%
rename from src/Internal/DependencyManagement/ServiceProviders/ThemeManagementServiceProvider.php
rename to src/Internal/DependencyManagement/ServiceProviders/RestockRefundedItemsAdjusterServiceProvider.php
index 7216b04271b..08d9f5e8922 100644
--- a/src/Internal/DependencyManagement/ServiceProviders/ThemeManagementServiceProvider.php
+++ b/src/Internal/DependencyManagement/ServiceProviders/RestockRefundedItemsAdjusterServiceProvider.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * ThemeManagementServiceProvider class file.
+ * RestockRefundedItemsAdjusterServiceProvider class file.
  */
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
 
-use Automattic\WooCommerce\Internal\ThemeSupport;
 use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
+use Automattic\WooCommerce\Internal\RestockRefundedItemsAdjuster;
 
 /**
- * Service provider for the classes in the Automattic\WooCommerce\ThemeManagement namespace.
+ * Service provider for the RestockRefundedItemsAdjuster class.
  */
-class ThemeManagementServiceProvider extends AbstractServiceProvider {
+class RestockRefundedItemsAdjusterServiceProvider extends AbstractServiceProvider {
 
 	/**
 	 * The classes/interfaces that are serviced by this service provider.
@@ -19,13 +19,13 @@ class ThemeManagementServiceProvider extends AbstractServiceProvider {
 	 * @var array
 	 */
 	protected $provides = array(
-		ThemeSupport::class,
+		RestockRefundedItemsAdjuster::class,
 	);
 
 	/**
 	 * Register the classes.
 	 */
 	public function register() {
-		$this->share_with_auto_arguments( ThemeSupport::class );
+		$this->share( RestockRefundedItemsAdjuster::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/RestockRefundedItemsAdjuster.php b/src/Internal/RestockRefundedItemsAdjuster.php
new file mode 100644
index 00000000000..b4ccb4f62cb
--- /dev/null
+++ b/src/Internal/RestockRefundedItemsAdjuster.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * RestockRefundedItemsAdjuster class file.
+ */
+
+namespace Automattic\WooCommerce\Internal;
+
+use Automattic\WooCommerce\Proxies\LegacyProxy;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class to adjust or initialize the restock refunded items.
+ */
+class RestockRefundedItemsAdjuster {
+	/**
+	 * The order factory to use.
+	 *
+	 * @var WC_Order_Factory
+	 */
+	private $order_factory;
+
+	/**
+	 * Class initialization, to be executed when the class is resolved by the container.
+	 *
+	 * @internal
+	 */
+	final public function init() {
+		$this->order_factory = wc_get_container()->get( LegacyProxy::class )->get_instance_of( \WC_Order_Factory::class );
+		add_action( 'woocommerce_before_save_order_items', array( $this, 'initialize_restock_refunded_items' ), 10, 2 );
+	}
+
+	/**
+	 * Initializes the restock refunded items meta for order version less than 5.5.
+	 *
+	 * @see https://github.com/woocommerce/woocommerce/issues/29502
+	 *
+	 * @param int   $order_id Order ID.
+	 * @param array $items Order items to save.
+	 */
+	public function initialize_restock_refunded_items( $order_id, $items ) {
+		$order         = wc_get_order( $order_id );
+		$order_version = $order->get_version();
+
+		if ( version_compare( $order_version, '5.5', '>=' ) ) {
+			return;
+		}
+
+		// If there are no refund lines, then this migration isn't necessary because restock related meta's wouldn't be set.
+		if ( 0 === count( $order->get_refunds() ) ) {
+			return;
+		}
+
+		if ( isset( $items['order_item_id'] ) ) {
+			foreach ( $items['order_item_id'] as $item_id ) {
+				$item = $this->order_factory::get_order_item( absint( $item_id ) );
+
+				if ( ! $item ) {
+					continue;
+				}
+
+				if ( 'line_item' !== $item->get_type() ) {
+					continue;
+				}
+
+				// There could be code paths in custom code which don't update version number but still update the items.
+				if ( '' !== $item->get_meta( '_restock_refunded_items', true ) ) {
+					continue;
+				}
+
+				$refunded_item_quantity = abs( $order->get_qty_refunded_for_item( $item->get_id() ) );
+				$item->add_meta_data( '_restock_refunded_items', $refunded_item_quantity, false );
+				$item->save();
+			}
+		}
+	}
+}
diff --git a/src/Internal/ThemeSupport.php b/src/Internal/ThemeSupport.php
deleted file mode 100644
index 46e627eb137..00000000000
--- a/src/Internal/ThemeSupport.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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
index b381dbef86a..8f63dbd5f89 100644
--- a/src/Utilities/ArrayUtil.php
+++ b/src/Utilities/ArrayUtil.php
@@ -44,5 +44,28 @@ class ArrayUtil {
 
 		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/emails/customer-invoice.php b/templates/emails/customer-invoice.php
index e0564448390..139512a5b22 100644
--- a/templates/emails/customer-invoice.php
+++ b/templates/emails/customer-invoice.php
@@ -29,7 +29,7 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 <?php /* translators: %s: Customer first name */ ?>
 <p><?php printf( esc_html__( 'Hi %s,', 'woocommerce' ), esc_html( $order->get_billing_first_name() ) ); ?></p>
 
-<?php if ( $order->has_status( 'pending' ) ) { ?>
+<?php if ( $order->needs_payment() ) { ?>
 	<p>
 	<?php
 	printf(
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..ea1d2914f4b 100644
--- a/tests/e2e/api/CHANGELOG.md
+++ b/tests/e2e/api/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Unreleased
 
+# 0.2.0
+
+## Added
+
+- Support for orders.
+
+## Changed
+
+- `delete()` now deletes products and coupons instead of moving to `trash`.
 
 # 0.1.2
 
@@ -14,7 +23,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..242996712fe 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,24 +88,24 @@ 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
-- `list` - Retrieve a list of the existing objects of that model type
+- `list( {...parameters} )` - Retrieve a list of the existing objects of that model type
 - `read( objectId )` - Read a single object of the model type
 - `update( objectId, {...properties} )` - Update a single object of the model type
 
 #### 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 b33e892c704..579b4399c2f 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.2",
+  "version": "0.2.0",
   "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": {
diff --git a/tests/e2e/api/package.json b/tests/e2e/api/package.json
index 933c01fd09d..23826401280 100644
--- a/tests/e2e/api/package.json
+++ b/tests/e2e/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@woocommerce/api",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "author": "Automattic",
   "description": "A simple interface for interacting with a WooCommerce installation.",
   "homepage": "https://github.com/woocommerce/woocommerce/tree/trunk/tests/e2e/api/README.md",
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 b879aca4516..a6bd801feea 100644
--- a/tests/e2e/config/jest.setup.js
+++ b/tests/e2e/config/jest.setup.js
@@ -1,50 +1,56 @@
-import { SimpleProduct, Coupon } from '@woocommerce/api';
 import {
-	visitAdminPage,
-	switchUserToTest,
 	clearLocalStorage,
 	setBrowserViewport,
 	withRestApi,
+	WP_ADMIN_LOGIN
 } from '@woocommerce/e2e-utils';
 
-const { merchant } = require( '@woocommerce/e2e-utils' );
+const config = require('config');
+const { HTTPClientFactory } = require('@woocommerce/api');
+const { addConsoleSuppression } = require( '@woocommerce/e2e-environment' );
+
+// @todo: remove this once https://github.com/woocommerce/woocommerce-admin/issues/6992 has been addressed
+addConsoleSuppression( 'woocommerce_shared_settings' );
 
 /**
- * Navigates to the post listing screen and bulk-trashes any posts which exist.
- *
- * @return {Promise} Promise resolving once posts have been trashed.
+ * Uses the WordPress API to delete all existing posts
  */
 async function trashExistingPosts() {
-	await merchant.login();
-	// Visit `/wp-admin/edit.php` so we can see a list of posts and delete them.
-	await visitAdminPage( 'edit.php' );
+	const apiUrl = config.get('url');
+	const wpPostsEndpoint = '/wp/v2/posts';
+	const adminUsername = config.get('users.admin.username');
+	const adminPassword = config.get('users.admin.password');
+	const client = HTTPClientFactory.build(apiUrl)
+		.withBasicAuth(adminUsername, adminPassword)
+		.create();
 
-	// If this selector doesn't exist there are no posts for us to delete.
-	const bulkSelector = await page.$( '#bulk-action-selector-top' );
-	if ( ! bulkSelector ) {
-		return;
+	// List all existing posts
+	const response = await client.get(wpPostsEndpoint);
+	const posts = response.data;
+
+	// Delete each post
+	for (const post of posts) {
+		await client.delete(`${wpPostsEndpoint}/${post.id}`);
 	}
 
-	// Select all posts.
-	await page.waitForSelector( '#cb-select-all-1' );
-	await page.click( '#cb-select-all-1' );
-	// Select the "bulk actions" > "trash" option.
-	await page.select( '#bulk-action-selector-top', 'trash' );
-	// Submit the form to send all draft/scheduled/published posts to the trash.
-	await page.click( '#doaction' );
-	await page.waitForXPath(
-		'//*[contains(@class, "updated notice")]/p[contains(text(), "moved to the Trash.")]'
-	);
-	await switchUserToTest();
 }
 
 // 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 () => {
+beforeAll(async () => {
 	await trashExistingPosts();
 	await withRestApi.deleteAllProducts();
 	await withRestApi.deleteAllCoupons();
+	await page.goto(WP_ADMIN_LOGIN);
 	await clearLocalStorage();
-	await setBrowserViewport( 'large' );
-} );
+	await setBrowserViewport('large');
+});
+
+// Clear browser cookies and cache using DevTools.
+// This is to ensure that each test ends with no user logged in.
+afterAll(async () => {
+	const client = await page.target().createCDPSession();
+	await client.send('Network.clearBrowserCookies');
+	await client.send('Network.clearBrowserCache');
+});
diff --git a/tests/e2e/core-tests/CHANGELOG.md b/tests/e2e/core-tests/CHANGELOG.md
index 7dc328942d6..4b043535e6b 100644
--- a/tests/e2e/core-tests/CHANGELOG.md
+++ b/tests/e2e/core-tests/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Support for re-running setup and shopper tests
 - Shopper Order Email Receiving
+- New tests - See [README.md](https://github.com/woocommerce/woocommerce/blob/trunk/tests/e2e/core-tests/README.md) for list of available tests
 
 ## Fixed
 
diff --git a/tests/e2e/core-tests/README.md b/tests/e2e/core-tests/README.md
index fc3956293a6..58dfec339f0 100644
--- a/tests/e2e/core-tests/README.md
+++ b/tests/e2e/core-tests/README.md
@@ -50,6 +50,7 @@ The functions to access the core tests are:
 ### Merchant
 
 - `runMerchantTests` - Run all merchant tests
+  - `runAddShippingClassesTest` - Merchant can create shipping classes and let shopper test them
   - `runAddNewShippingZoneTest` - Merchant can create shipping zones and let shopper test them
   - `runAddSimpleProductTest` - Merchant can create a simple product
   - `runAddVariableProductTest` - Merchant can create a variable product
@@ -57,6 +58,7 @@ The functions to access the core tests are:
   - `runCreateOrderTest` - Merchant can create order
   - `runMerchantOrdersCustomerPaymentPage` - Merchant can visit the customer payment page
   - `runMerchantOrderEmailsTest` - Merchant can receive order emails and resend emails by Order Actions
+  - `runEditOrderTest` - Merchant can edit an order in the dashboard
   - `runOrderStatusFilterTest` - Merchant can filter orders by order status
   - `runOrderRefundTest` - Merchant can refund an order
   - `runOrderApplyCouponTest` - Merchant can apply a coupon to an order
@@ -69,6 +71,7 @@ The functions to access the core tests are:
   - `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
+  - `runInitiateWccomConnectionTest` - Merchant can initiate connection to WooCommerce.com
 
 ### Shopper
 
@@ -96,7 +99,7 @@ The functions to access the core tests are:
   - `runGroupedProductAPITest` - Can create, read, and delete a grouped product
   - `runVariableProductAPITest` - Can create, read, and delete a variable product and its variations
   - `runCouponApiTest` - Can create, read, and delete a coupon
-
+  - `runOrderApiTest` - Can create, read, and delete an order
 
 ## Contributing a new test
 
diff --git a/tests/e2e/core-tests/package.json b/tests/e2e/core-tests/package.json
index 06c0628b776..e5d30dac8bb 100644
--- a/tests/e2e/core-tests/package.json
+++ b/tests/e2e/core-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@woocommerce/e2e-core-tests",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "End-To-End (E2E) tests for WooCommerce",
   "homepage": "https://github.com/woocommerce/woocommerce/tree/trunk/tests/e2e/core-tests/README.md",
   "repository": {
@@ -15,8 +15,8 @@
     "faker": "^5.1.0"
   },
   "peerDependencies": {
-    "@woocommerce/api": "^0.1.2",
-    "@woocommerce/e2e-utils": "^0.1.4"
+    "@woocommerce/api": "^0.2.0",
+    "@woocommerce/e2e-utils": "^0.1.5"
   },
   "publishConfig": {
     "access": "public"
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 47aeecb715f..fefdf853838 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
@@ -24,6 +24,10 @@ const shippingZoneNameUS = config.get( 'addresses.customer.shipping.country' );
 
 const runOnboardingFlowTest = () => {
 	describe('Store owner can go through store Onboarding', () => {
+		beforeAll(async () => {
+			await merchant.login();
+		});
+
 		if ( IS_RETEST_MODE ) {
 			it('can reset onboarding to default settings', async () => {
 				await withRestApi.resetOnboarding();
@@ -48,6 +52,10 @@ const runOnboardingFlowTest = () => {
 
 const runTaskListTest = () => {
 	describe('Store owner can go through setup Task List', () => {
+		beforeAll(async () => {
+			await merchant.login();
+		});
+		
 		it('can setup shipping', async () => {
 			await page.evaluate(() => {
 				document.querySelector('.woocommerce-list__item-title').scrollIntoView();
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 6ebc3fe961e..1183c8c1077 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
@@ -27,6 +27,9 @@ const {
 
 const runInitialStoreSettingsTest = () => {
 	describe('Store owner can finish initial store setup', () => {
+		beforeAll(async () => {
+			await merchant.login();
+		});
 
 		it('can enable tax rates and calculations', async () => {
 			// Go to general settings page
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 a0eca5a730f..030605d5bd3 100644
--- a/tests/e2e/core-tests/specs/index.js
+++ b/tests/e2e/core-tests/specs/index.js
@@ -45,12 +45,14 @@ const runMerchantOrderEmailsTest = require( './merchant/wp-admin-order-emails.te
 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();
@@ -97,6 +99,7 @@ const runMerchantTests = () => {
 	runProductSearchTest();
 	runMerchantOrdersCustomerPaymentPage();
 	runAnalyticsPageLoadsTest();
+	runInitiateWccomConnectionTest();
 }
 
 const runApiTests = () => {
@@ -104,6 +107,7 @@ const runApiTests = () => {
 	runGroupedProductAPITest();
 	runVariableProductAPITest();
 	runCouponApiTest();
+	runOrderApiTest();
 }
 
 module.exports = {
@@ -133,6 +137,7 @@ module.exports = {
 	runUpdateGeneralSettingsTest,
 	runProductSettingsTest,
 	runTaxSettingsTest,
+	runOrderApiTest,
 	runOrderStatusFiltersTest,
 	runOrderRefundTest,
 	runOrderApplyCouponTest,
@@ -154,4 +159,5 @@ module.exports = {
 	runCartRedirectionTest,
 	runMyAccountCreateAccountTest,
 	runOrderEmailReceivingTest,
+	runInitiateWccomConnectionTest,
 };
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-analytics-page-loads.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-analytics-page-loads.test.js
index 15c7cda6b3c..33122f492a3 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-analytics-page-loads.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-analytics-page-loads.test.js
@@ -4,6 +4,7 @@
  */
  const {
 	merchant,
+	waitForSelectorWithoutThrow,
 } = require( '@woocommerce/e2e-utils' );
 
 /**
@@ -25,7 +26,14 @@ const {
 const checkHeadingAndElement = async (
 	pageTitle, element = '.d3-chart__empty-message', elementText = 'No data for the selected date range') => {
 	await expect(page).toMatchElement('h1', {text: pageTitle});
-	await expect(page).toMatchElement(element, elementText);
+
+	// Depending on order of tests the chart may not be empty.
+	const found = await waitForSelectorWithoutThrow( element );
+	if ( found ) {
+		await expect(page).toMatchElement(element, {text: elementText});
+	} else {
+		await expect(page).toMatchElement( '.woocommerce-chart' );
+	}
  };
 
 const runAnalyticsPageLoadsTest = () => {
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 3aa75b25b57..92ac2edefc2 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
@@ -4,13 +4,13 @@
  * Internal dependencies
  */
 const {
-	merchant,
 	createSimpleProduct,
 	createSimpleOrder,
 	createCoupon,
 	uiUnblocked,
 	addProductToOrder,
 	evalAndClick,
+	merchant
 } = require( '@woocommerce/e2e-utils' );
 
 const config = require( 'config' );
@@ -26,10 +26,12 @@ let orderId;
 const runOrderApplyCouponTest = () => {
 	describe('WooCommerce Orders > Apply coupon', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
 			couponCode = await createCoupon();
+			
+			await merchant.login();
 			orderId = await createSimpleOrder('Pending payment', simpleProductName);
+			
 			await Promise.all([
 				addProductToOrder(orderId, simpleProductName),
 
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-customer-payment-page.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-customer-payment-page.test.js
index 8c597d3ed5a..767d12a5dda 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-customer-payment-page.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-customer-payment-page.test.js
@@ -20,8 +20,9 @@ let orderId;
 const runMerchantOrdersCustomerPaymentPage = () => {
 	describe('WooCommerce Merchant Flow: Orders > Customer Payment Page', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
+			
+			await merchant.login();
 			orderId = await createSimpleOrder();
 			await addProductToOrder( orderId, simpleProductName );
 
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-refund.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-refund.test.js
index 0dc0911c8e6..1e806316bb1 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-refund.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-refund.test.js
@@ -45,8 +45,9 @@ const clickAndWaitForSelector = async ( buttonSelector, resultSelector ) => {
 const runRefundOrderTest = () => {
 	describe('WooCommerce Orders > Refund an order', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
+
+			await merchant.login();
 			orderId = await createSimpleOrder();
 			await addProductToOrder(orderId, simpleProductName);
 
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 78e4fef92da..41cf52e4afb 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
@@ -15,8 +15,8 @@ let productId;
 const runProductEditDetailsTest = () => {
 	describe('Products > Edit Product', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			productId = await createSimpleProduct();
+			await merchant.login();
 		});
 
 		it('can edit a product and save the changes', async () => {
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
index d3cb10e1b94..1e2b945ad24 100644
--- 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
@@ -5,7 +5,7 @@
  const {
 	merchant,
 	setCheckbox,
-	moveAllItemsToTrash
+	withRestApi,
 } = require( '@woocommerce/e2e-utils' );
 const getCoreTestsRoot = require( '../../core-tests-root' );
 
@@ -63,7 +63,7 @@ const runImportProductsTest = () => {
 			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('section.woocommerce-importer-done', {visible:true, timeout: 120000});
 			await page.waitForSelector('.woocommerce-importer-done');
 			await expect(page).toMatchElement('.woocommerce-importer-done', {text: 'Import complete!'});
 		});
@@ -108,10 +108,12 @@ const runImportProductsTest = () => {
 
 			// Gathering product names
 			await page.waitForSelector('a.row-title');
-			const productTitles = await page.$$eval('a.row-title',
-			 elements => elements.map(item => item.innerHTML));
+			const productTitles = await page.$$eval(
+				'a.row-title',
+				elements => elements.map(item => item.innerHTML)
+			);
 
-			// Compare overriden product names
+			// Compare overridden product names
 			expect(productTitles.sort()).toEqual(productNamesOverride.sort());
 
 			// Gathering product prices
@@ -119,12 +121,11 @@ const runImportProductsTest = () => {
 			const productPrices = await page.$$eval('.amount',
 			 elements => elements.map(item => item.innerText));
 
-			// Compare overriden product prices
+			// Compare overridden product prices
 			expect(productPrices.sort()).toEqual(productPricesOverride.sort());
 
-			// Move all imported products to trash
-			await moveAllItemsToTrash();
-
+			// Delete imported products
+			await withRestApi.deleteAllProducts();
 		});
 	});
 };
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 360bb7c8df2..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,23 +63,55 @@ 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);
 		});
 	});
 };
@@ -88,7 +122,7 @@ const runAddVariableProductTest = () => {
 			await merchant.login();
 		});
 
-		it('can create variable product', async () => {
+		it('can create product with variations', async () => {
 			await openNewProductAndVerify();
 
 			// Set product data
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-search.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-search.test.js
index a9640f303ee..d397c5685dc 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-search.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-search.test.js
@@ -15,11 +15,12 @@ const simpleProductPrice = config.has('products.simple.price') ? config.get('pro
 const runProductSearchTest = () => {
 	describe('Products > Search and View a product', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
 
 			// Make sure the simple product name is greater than 1 to do a search
 			await expect(simpleProductName.length).toBeGreaterThan(1);
+
+			await merchant.login();
 		});
 
 		beforeEach(async () => {
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 c6bae31d94f..2f5b4a19bc0 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
@@ -34,8 +34,8 @@ const shippingZoneNameSF = 'SF with Local pickup';
 const runAddNewShippingZoneTest = () => {
 	describe('WooCommerce Shipping Settings - Add new shipping zone', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
+			await merchant.login();
 			await deleteAllShippingZones();
 		});
 
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
index 7bdccb60e00..5c26b217de4 100644
--- 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
@@ -40,9 +40,10 @@ const shippingCountryFR = 'country:FR';
 const runCartCalculateShippingTest = () => {
 	describe('Cart Calculate Shipping', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct(firstProductName);
 			await createSimpleProduct(secondProductName, secondProductPrice);
+
+			await merchant.login();
 			await merchant.openNewShipping();
 
 			// Add a new shipping zone Germany with Free shipping
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 c234767f3d6..f2389089819 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
@@ -4,7 +4,6 @@
  */
 const {
 	shopper,
-	merchant,
 	createCoupon,
 	createSimpleProduct,
 	uiUnblocked,
@@ -28,12 +27,10 @@ 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');
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
index 6f24c50f5ed..bff1ada7665 100644
--- 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
@@ -28,10 +28,10 @@ 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.login();
 			await merchant.openSettings('products');
 			await setCheckbox('#woocommerce_cart_redirect_after_add');
 			await settingsPageSaveChanges();
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 c9b221fc3cd..e9bc8c8445c 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
@@ -4,7 +4,6 @@
  */
 const {
 	shopper,
-	merchant,
 	createSimpleProduct,
 	uiUnblocked
 } = require( '@woocommerce/e2e-utils' );
@@ -26,9 +25,7 @@ const twoProductPrice = singleProductPrice * 2;
 const runCartPageTest = () => {
 	describe('Cart page', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
-			await merchant.logout();
 		});
 
 		it('should display no item in the cart', async () => {
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 5722a4f1956..8567c21ba39 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
@@ -4,7 +4,6 @@
  */
 const {
 	shopper,
-	merchant,
 	createCoupon,
 	createSimpleProduct,
 	uiUnblocked,
@@ -28,12 +27,10 @@ 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');
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
index db400d5e79d..6f8bf2b6b0a 100644
--- 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
@@ -26,10 +26,10 @@ 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.login();
 			await merchant.openSettings('account');
 			await setCheckbox('#woocommerce_enable_checkout_login_reminder');
 			await settingsPageSaveChanges();
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..46bf8121eff 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' );
@@ -26,9 +27,11 @@ let customerOrderId;
 const runCheckoutPageTest = () => {
 	describe('Checkout page', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			await createSimpleProduct();
 
+			// Set free shipping within California
+			await merchant.login();
+			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-pay-order.test.js b/tests/e2e/core-tests/specs/shopper/front-end-my-account-pay-order.test.js
index ae17eeb617f..9ae0790f87f 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-my-account-pay-order.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-my-account-pay-order.test.js
@@ -17,9 +17,7 @@ const simpleProductName = config.get( 'products.simple.name' );
 const runMyAccountPayOrderTest = () => {
 	describe('Customer can pay for their order through My Account', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			simplePostIdValue = await createSimpleProduct();
-			await merchant.logout();
 			await shopper.login();
 			await shopper.goToProduct(simplePostIdValue);
 			await shopper.addToCart(simpleProductName);
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-my-account.test.js b/tests/e2e/core-tests/specs/shopper/front-end-my-account.test.js
index ac283f2f20a..8e7ef988273 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-my-account.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-my-account.test.js
@@ -10,7 +10,6 @@ const {
 const runMyAccountPageTest = () => {
 	describe('My account page', () => {
 		it('allows customer to login', async () => {
-			await merchant.logout();
 			await shopper.login();
 			await expect(page).toMatch('Hello');
 			await expect(page).toMatchElement('.woocommerce-MyAccount-navigation-link', {text: 'Dashboard'});
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
index da466cae6de..595879c8973 100644
--- 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
@@ -29,9 +29,10 @@ const {
 const runOrderEmailReceivingTest = () => {
 	describe('Shopper Order Email Receiving', () => {
 		beforeAll(async () => {
+			simplePostIdValue = await createSimpleProduct();
+			
 			await merchant.login();
 			await deleteAllEmailLogs();
-			simplePostIdValue = await createSimpleProduct();
 			await merchant.logout();
 		});
 
diff --git a/tests/e2e/core-tests/specs/shopper/front-end-single-product.test.js b/tests/e2e/core-tests/specs/shopper/front-end-single-product.test.js
index 3f914bdd2bc..8d6fc05e9bd 100644
--- a/tests/e2e/core-tests/specs/shopper/front-end-single-product.test.js
+++ b/tests/e2e/core-tests/specs/shopper/front-end-single-product.test.js
@@ -20,9 +20,7 @@ const simpleProductName = config.get( 'products.simple.name' );
 const runSingleProductPageTest = () => {
 	describe('Single Product Page', () => {
 		beforeAll(async () => {
-			await merchant.login();
 			simplePostIdValue = await createSimpleProduct();
-			await merchant.logout();
 		});
 
 		it('should be able to add simple products to the cart', async () => {
diff --git a/tests/e2e/env/CHANGELOG.md b/tests/e2e/env/CHANGELOG.md
index bf567bbe49a..9d49bdc3498 100644
--- a/tests/e2e/env/CHANGELOG.md
+++ b/tests/e2e/env/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 0.2.2
+
 ## Added
 
 - `takeScreenshotFor` utility function to take screenshots within tests
diff --git a/tests/e2e/env/README.md b/tests/e2e/env/README.md
index c79723412d2..e61c291bace 100644
--- a/tests/e2e/env/README.md
+++ b/tests/e2e/env/README.md
@@ -133,6 +133,24 @@ module.exports = puppeteerConfig;
 
 Jest provides [setup and teardown functions](https://jestjs.io/docs/setup-teardown) similar to PHPUnit. The default setup and teardown is in [`tests/e2e/env/src/setup/jest.setup.js`](src/setup/jest.setup.js). Additional setup and teardown functions can be added to [`tests/e2e/config/jest.setup.js`](../config/jest.setup.js)
 
+#### Console filtering
+
+**Added version 0.2.3**
+By default, messages logged to the console are included in the test results. The test runner suppresses 404 not found and proxy connection messages. 
+
+Pages that you are testing may contain repetitive console output that you expect. Use `addConsoleSuppression` in your jest setup script to filter these repetitive messages:
+
+```js
+addConsoleSuppression( 'suppress this after the first instance' );
+addConsoleSuppression( 'suppress this completely', false );
+```
+
+Console suppressions can be removed with `removeConsoleSuppression`. The `searchString` parameter needs to match the `addConsoleSuppression` parameter:
+
+```js
+removeConsoleSuppression( 'suppress this after the first instance' );
+```
+
 ### Container Setup
 
 Depending on the project and testing scenario, the built in testing environment container might not be the best solution for testing. This could be local testing where there is already a testing container, a repository that isn't a plugin or theme and there are multiple folders mapped into the container, or similar. The `e2e-environment` test runner supports using either the built in container or an external container. See the appropriate readme for  details:
diff --git a/tests/e2e/env/builtin.md b/tests/e2e/env/builtin.md
index 7161bc80a4e..4f535efe69d 100644
--- a/tests/e2e/env/builtin.md
+++ b/tests/e2e/env/builtin.md
@@ -33,7 +33,20 @@ 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 \
+	--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
+
+# install the WP Mail Logging plugin to test emails
+wp plugin install wp-mail-logging --activate
 ```
+
 ### Adhoc Initialization
 
 The container build script supports an initialization script parameter
diff --git a/tests/e2e/env/external.md b/tests/e2e/env/external.md
index 12334f89379..a58d96b3ed8 100644
--- a/tests/e2e/env/external.md
+++ b/tests/e2e/env/external.md
@@ -23,7 +23,11 @@ Each project will have its own begin test state and initialization script. For e
 wp core install --url=http://localhost:8084 --admin_user=admin --admin_password=password --admin_email=wooadmin@example.org
 wp plugin activate woocommerce
 wp theme install twentynineteen --activate
-wp user create customer customer@woocommercecoree2etestsuite.com --user_pass=password --role=customer
+wp user create customer customer@woocommercecoree2etestsuite.com \
+	--user_pass=password \
+	--role=subscriber \
+	--first_name='Jane' \
+	--last_name='Smith'
 ```
 
 ### Test Sequencer Setup
diff --git a/tests/e2e/env/package-lock.json b/tests/e2e/env/package-lock.json
index 2766327b895..c3b9b30dc8a 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.1",
+	"version": "0.2.2",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/tests/e2e/env/package.json b/tests/e2e/env/package.json
index 1e59ac7cd5e..2a31959d5ea 100644
--- a/tests/e2e/env/package.json
+++ b/tests/e2e/env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@woocommerce/e2e-environment",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "WooCommerce End to End Testing Environment Configuration.",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",
diff --git a/tests/e2e/env/src/setup/jest.setup.js b/tests/e2e/env/src/setup/jest.setup.js
index 0e438dfff54..3a88c83a653 100644
--- a/tests/e2e/env/src/setup/jest.setup.js
+++ b/tests/e2e/env/src/setup/jest.setup.js
@@ -7,10 +7,8 @@ import {
 	enablePageDialogAccept,
 	isOfflineMode,
 	setBrowserViewport,
-	switchUserToAdmin,
-	switchUserToTest,
-	visitAdminPage,
 } from '@wordpress/e2e-test-utils';
+import { consoleShouldSuppress, addConsoleSuppression } from '../../utils';
 
 /**
  * Array of page event tuples of [ eventName, handler ].
@@ -18,21 +16,13 @@ import {
  * @type {Array}
  */
 const pageEvents = [];
+
 /**
  * Set of logged messages that will only be logged once.
- *
- * @type {Object<string,object>}
  */
-const loggedMessages = {
-	proxy: {
-		logged: false,
-		text: 'Failed to load resource: net::ERR_PROXY_CONNECTION_FAILED',
-	},
-	http404: {
-		logged: false,
-		text: 'the server responded with a status of 404',
-	},
-};
+addConsoleSuppression('Failed to load resource: net::ERR_PROXY_CONNECTION_FAILED');
+addConsoleSuppression('the server responded with a status of 404');
+
 /**
  * Set of console logging types observed to protect against unexpected yet
  * handled (i.e. not catastrophic) errors or warnings. Each key corresponds
@@ -143,19 +133,11 @@ function observeConsoleLogging() {
 
 		const logFunction = OBSERVED_CONSOLE_MESSAGE_TYPES[ type ];
 
-		// Limit warnings on missing resources.
-		let previouslyLogged = false;
-		Object.keys( loggedMessages ).forEach( function( key ) {
-			if ( text.includes( loggedMessages[ key ].text ) ) {
-				if ( loggedMessages[ key ].logged ) {
-					previouslyLogged = true;
-				}
-				loggedMessages[ key ].logged = true;
-			}
-		} );
-		if ( previouslyLogged ) {
+		// Limit repeated warnings.
+		if ( consoleShouldSuppress( text ) ) {
 			return;
 		}
+
 		// As of Puppeteer 1.6.1, `message.text()` wrongly returns an object of
 		// type JSHandle for error logging, instead of the expected string.
 		//
diff --git a/tests/e2e/env/utils/filter-console.js b/tests/e2e/env/utils/filter-console.js
new file mode 100644
index 00000000000..f7a40962882
--- /dev/null
+++ b/tests/e2e/env/utils/filter-console.js
@@ -0,0 +1,60 @@
+/**
+ * Suppress console messages
+ */
+
+const messagesToSuppress = [];
+
+/**
+ * Check whether the text is from a console message that should be suppressed
+ *
+ * @param text
+ * @returns {boolean}
+ */
+const consoleShouldSuppress = ( text ) => {
+	let shouldSuppress = false;
+	for ( let m = 0; m < messagesToSuppress.length; m++ ) {
+		if ( text.indexOf( messagesToSuppress[ m ].text ) < 0 ) {
+			continue;
+		}
+
+		shouldSuppress = messagesToSuppress[ m ].logged;
+		messagesToSuppress[ m ].logged = true;
+		break;
+	}
+	return shouldSuppress;
+};
+
+/**
+ * Add a partial string match to suppress console logging of repetitive messages
+ * @param searchString
+ * @param logFirstInstance
+ */
+const addConsoleSuppression = ( searchString, logFirstInstance = true ) => {
+	messagesToSuppress.push( {
+		text: searchString,
+		logged: ! Boolean( logFirstInstance ),
+	});
+};
+
+/**
+ * Remove a partial string match from suppressed console logging
+ * @param searchString
+ */
+const removeConsoleSuppression = ( searchString ) => {
+	let toRemove = -1;
+	for ( let m = 0; m < messagesToSuppress.length; m++ ) {
+		if ( messagesToSuppress[ m ].text == searchString ) {
+			toRemove = m;
+			break;
+		}
+	}
+	if ( toRemove >= 0 ) {
+		messagesToSuppress.splice( toRemove, 1 );
+	}
+};
+
+module.exports = {
+	consoleShouldSuppress,
+	addConsoleSuppression,
+	removeConsoleSuppression,
+};
diff --git a/tests/e2e/env/utils/index.js b/tests/e2e/env/utils/index.js
index bb6331f46bb..d66733a44fd 100644
--- a/tests/e2e/env/utils/index.js
+++ b/tests/e2e/env/utils/index.js
@@ -2,6 +2,7 @@ const getAppRoot = require( './app-root' );
 const { getAppName, getAppBase } = require( './app-name' );
 const { getTestConfig, getAdminConfig } = require( './test-config' );
 const takeScreenshotFor = require( './take-screenshot' );
+const consoleUtils = require( './filter-console' );
 
 module.exports = {
 	getAppBase,
@@ -10,4 +11,5 @@ module.exports = {
 	getTestConfig,
 	getAdminConfig,
 	takeScreenshotFor,
+	...consoleUtils,
 };
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/test-cart-calculate-shipping.js b/tests/e2e/specs/front-end/cart-calculate-shipping.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-cart-calculate-shipping.js
rename to tests/e2e/specs/front-end/cart-calculate-shipping.test.js
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/test-cart-redirection.js b/tests/e2e/specs/front-end/cart-redirection.cart.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-cart-redirection.js
rename to tests/e2e/specs/front-end/cart-redirection.cart.js
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/test-checkout-login-account.js b/tests/e2e/specs/front-end/checkout-login-account.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-checkout-login-account.js
rename to tests/e2e/specs/front-end/checkout-login-account.test.js
diff --git a/tests/e2e/specs/front-end/test-my-account-create-account.js b/tests/e2e/specs/front-end/my-account-create-account.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-my-account-create-account.js
rename to tests/e2e/specs/front-end/my-account-create-account.test.js
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/test-order-email-receiving.js b/tests/e2e/specs/front-end/order-email-receiving.test.js
similarity index 100%
rename from tests/e2e/specs/front-end/test-order-email-receiving.js
rename to tests/e2e/specs/front-end/order-email-receiving.test.js
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/test-add-shipping-classes.js b/tests/e2e/specs/wp-admin/create-shipping-classes.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-add-shipping-classes.js
rename to tests/e2e/specs/wp-admin/create-shipping-classes.test.js
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/test-product-import-csv.js b/tests/e2e/specs/wp-admin/product-import-csv.test.js
similarity index 100%
rename from tests/e2e/specs/wp-admin/test-product-import-csv.js
rename to tests/e2e/specs/wp-admin/product-import-csv.test.js
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 5ead83a94ea..332eee4c055 100644
--- a/tests/e2e/utils/CHANGELOG.md
+++ b/tests/e2e/utils/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 0.1.5
+
 ## Added
 
 - `emptyCart()` Shopper flow helper that empties the cart
diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md
index 9e02358b319..b6e75546e91 100644
--- a/tests/e2e/utils/README.md
+++ b/tests/e2e/utils/README.md
@@ -62,6 +62,7 @@ This package provides support for enabling retries in tests:
 - `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
 
@@ -100,6 +101,7 @@ This package provides support for enabling retries in tests:
 | `openAnalyticsPage` | | Open any Analytics page |
 | `openAllUsersView` | | Open the All Users page |
 | `openImportProducts` | | Open the Import Products page |
+| `openExtensions` | | Go to WooCommerce -> Extensions |
 
 ### Shopper `shopper`
 
diff --git a/tests/e2e/utils/package-lock.json b/tests/e2e/utils/package-lock.json
index 8bc72f6a287..eb4497e6cdf 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.5",
 	"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/package.json b/tests/e2e/utils/package.json
index fb359ff1a9e..89994c56a72 100644
--- a/tests/e2e/utils/package.json
+++ b/tests/e2e/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@woocommerce/e2e-utils",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "End-To-End (E2E) test utils for WooCommerce",
   "homepage": "https://github.com/woocommerce/woocommerce/tree/trunk/tests/e2e-utils/README.md",
   "repository": {
@@ -18,7 +18,7 @@
     "fishery": "^1.2.0"
   },
   "peerDependencies": {
-    "@woocommerce/api": "^0.1.2"
+    "@woocommerce/api": "^0.2.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/tests/e2e/utils/src/flows/constants.js b/tests/e2e/utils/src/flows/constants.js
index aefb87ec174..70e1e8f4fc3 100644
--- a/tests/e2e/utils/src/flows/constants.js
+++ b/tests/e2e/utils/src/flows/constants.js
@@ -36,6 +36,7 @@ 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}
diff --git a/tests/e2e/utils/src/flows/merchant.js b/tests/e2e/utils/src/flows/merchant.js
index 4e3add65a6e..aa78a709f8e 100644
--- a/tests/e2e/utils/src/flows/merchant.js
+++ b/tests/e2e/utils/src/flows/merchant.js
@@ -20,6 +20,7 @@ const {
 	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,
@@ -56,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 () => {
@@ -121,6 +124,12 @@ const merchant = {
 		} );
 	},
 
+	openExtensions: async () => {
+		await page.goto( WP_ADMIN_WC_EXTENSIONS, {
+			waitUntil: 'networkidle0',
+		} );
+	},
+
 	runSetupWizard: async () => {
 			const setupWizard = IS_RETEST_MODE ? WP_ADMIN_SETUP_WIZARD : WP_ADMIN_WC_HOME;
 			await page.goto( setupWizard, {
diff --git a/tests/e2e/utils/src/flows/shopper.js b/tests/e2e/utils/src/flows/shopper.js
index 1e2b7cd9d13..db347006ec3 100644
--- a/tests/e2e/utils/src/flows/shopper.js
+++ b/tests/e2e/utils/src/flows/shopper.js
@@ -137,7 +137,7 @@ const shopper = {
 		// Remove products if they exist
 		if ( await page.$( '.remove' ) !== null ) {
 			products = await page.$( '.remove' );
-			while ( products.length > 0 ) {
+			while ( products && products.length > 0 ) {
 				for (let p = 0; p < products.length; p++ ) {
 					await page.click( p );
 					await uiUnblocked();
diff --git a/tests/e2e/utils/src/flows/with-rest-api.js b/tests/e2e/utils/src/flows/with-rest-api.js
index 1deefb851bd..64b40d773ee 100644
--- a/tests/e2e/utils/src/flows/with-rest-api.js
+++ b/tests/e2e/utils/src/flows/with-rest-api.js
@@ -16,17 +16,24 @@ const userEndpoint = '/wp/v2/users';
 const deleteAllRepositoryObjects = async ( repository, defaultObjectId = null ) => {
 	let objects;
 	const minimum = defaultObjectId == null ? 0 : 1;
+	const statuses = ['draft','publish','trash'];
 
-	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;
+	for ( let s = 0; s < statuses.length; s++ ) {
+		const status = statuses[ s ];
+		objects = await repository.list( { status } );
+		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) {}
 			}
-			await repository.delete( objects[ o ].id );
+			objects = await repository.list( { status } );
 		}
-		objects = await repository.list();
 	}
 };
 
diff --git a/tests/legacy/bootstrap.php b/tests/legacy/bootstrap.php
index 62d93d87254..fd8bfb96dce 100644
--- a/tests/legacy/bootstrap.php
+++ b/tests/legacy/bootstrap.php
@@ -103,13 +103,7 @@ class WC_Unit_Tests_Bootstrap {
 	 * @throws Exception Error when initializing one of the hacks.
 	 */
 	private function initialize_code_hacker() {
-		$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',
-			)
-		);
+		CodeHacker::initialize( array( __DIR__ . '/../../includes/' ) );
 
 		$replaceable_functions = include_once __DIR__ . '/mockable-functions.php';
 		if ( ! empty( $replaceable_functions ) ) {
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/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/admin/class-wc-admin-functions-test.php b/tests/php/includes/admin/class-wc-admin-functions-test.php
index 18787eb02a7..8b0ae6934da 100644
--- a/tests/php/includes/admin/class-wc-admin-functions-test.php
+++ b/tests/php/includes/admin/class-wc-admin-functions-test.php
@@ -286,4 +286,122 @@ class WC_Admin_Functions_Test extends \WC_Unit_Test_Case {
 		// Stocks should have been increased to orignal amount minus the partially refunded stock.
 		$this->assertEquals( 95, $product->get_stock_quantity() );
 	}
+
+	/**
+	 * Test adjust line item function when order item is refunded with restock and then update order.
+	 *
+	 * @link https://github.com/woocommerce/woocommerce/issues/29502.
+	 */
+	public function test_admin_refund_with_restock_and_update_order() {
+		$product = WC_Helper_Product::create_simple_product();
+		$product->set_manage_stock( true );
+		$product->set_stock_quantity( 100 );
+		$product->set_price( 100 );
+		$product->set_regular_price( 100 );
+		$product->save();
+
+		$order = WC_Helper_Order::create_order();
+
+		$order->set_status( 'on-hold' );
+		$order_item_id = $order->add_product( $product, 10 );
+		$order_item = new WC_Order_Item_Product( $order_item_id );
+
+		// Stocks have not reduced yet.
+		$product = wc_get_product( $product->get_id() );
+		$this->assertEquals( 100, $product->get_stock_quantity() );
+
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+		$this->assertEquals( 90, $product->get_stock_quantity() );
+
+		$args = array(
+			'amount'     => 10,
+			'order_id'   => $order->get_id(),
+			'line_items' => array(
+				$order_item_id => array(
+					'qty'          => 5,
+					'refund_total' => 0,
+				),
+			),
+			'refund_payment' => false,
+			'restock_items'  => true,
+		);
+
+		wc_create_refund( $args );
+
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+
+		// Stocks should remain unchanged from after restocking via refund operation.
+		$this->assertEquals( 95, $product->get_stock_quantity() );
+
+		// Repeating steps above again to make sure nothing changes.
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+
+		// Stocks should remain unchanged from after restocking via refund operation.
+		$this->assertEquals( 95, $product->get_stock_quantity() );
+	}
+
+	/**
+	 * Test adjust line item function when order item is refunded without restock and then update order.
+	 *
+	 * @link https://github.com/woocommerce/woocommerce/issues/29502.
+	 */
+	public function test_admin_refund_without_restock_and_update_order() {
+		$product = WC_Helper_Product::create_simple_product();
+		$product->set_manage_stock( true );
+		$product->set_stock_quantity( 100 );
+		$product->set_price( 100 );
+		$product->set_regular_price( 100 );
+		$product->save();
+
+		$order = WC_Helper_Order::create_order();
+
+		$order->set_status( 'on-hold' );
+		$order_item_id = $order->add_product( $product, 10 );
+		$order_item = new WC_Order_Item_Product( $order_item_id );
+
+		// Stocks have not reduced yet.
+		$product = wc_get_product( $product->get_id() );
+		$this->assertEquals( 100, $product->get_stock_quantity() );
+
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+		$this->assertEquals( 90, $product->get_stock_quantity() );
+
+		$args = array(
+			'amount'     => 10,
+			'order_id'   => $order->get_id(),
+			'line_items' => array(
+				$order_item_id => array(
+					'qty'          => 5,
+					'refund_total' => 0,
+				),
+			),
+			'refund_payment' => false,
+			'restock_items'  => false,
+		);
+
+		wc_create_refund( $args );
+
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+
+		// Stocks should remain unchanged from the original order.
+		$this->assertEquals( 90, $product->get_stock_quantity() );
+
+		// Repeating steps above again to make sure nothing changes.
+		wc_maybe_adjust_line_item_product_stock( $order_item );
+
+		$product = wc_get_product( $product->get_id() );
+
+		// Stocks should remain unchanged from the original order.
+		$this->assertEquals( 90, $product->get_stock_quantity() );
+	}
 }
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 0a9b87a645f..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();
 	}
 
 	/**
diff --git a/tests/php/includes/customizer/class-wc-shop-customizer-test.php b/tests/php/includes/customizer/class-wc-shop-customizer-test.php
deleted file mode 100644
index 0dc8057ccc9..00000000000
--- a/tests/php/includes/customizer/class-wc-shop-customizer-test.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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/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
deleted file mode 100644
index 0add81a3415..00000000000
--- a/tests/php/src/ThemeSupport/ThemeSupportTest.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?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
index 77f225942ac..f7bbc439089 100644
--- a/tests/php/src/Utilities/ArrayUtilTest.php
+++ b/tests/php/src/Utilities/ArrayUtilTest.php
@@ -8,6 +8,7 @@ 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.
 	 *
@@ -63,4 +64,74 @@ class ArrayUtilTest extends \WC_Unit_Test_Case {
 
 		$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 1fb1516fb43..57edd900f95 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.4.0-dev
+ * Version: 5.5.0-dev
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain: woocommerce