diff --git a/.github/scripts/.gitignore b/.github/scripts/.gitignore
new file mode 100644
index 000000000000..b908d4cbe37c
--- /dev/null
+++ b/.github/scripts/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/
+*.pyc
+.DS_Store
diff --git a/.github/scripts/check_copyright_pr.php b/.github/scripts/check_copyright_pr.php
new file mode 100644
index 000000000000..4b05ea8f6270
--- /dev/null
+++ b/.github/scripts/check_copyright_pr.php
@@ -0,0 +1,325 @@
+<?php
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+/**
+ * PR copyright header checker.
+ *
+ * New files      — must carry the current year in the correct format for the repo edition.
+ * Existing files — the normalized copyright header must be identical to the base branch;
+ *                  the year must not be changed.
+ *
+ * Usage:
+ *   php check_copyright_pr.php \
+ *     --files   /tmp/copyright_changed.txt \
+ *     --added   /tmp/copyright_added.txt \
+ *     --base-dir <dir> \
+ *     --template .github/scripts/copyright-template.txt
+ */
+
+// ── Argument parsing ──────────────────────────────────────────────────────────
+
+$opts = getopt('', ['files:', 'added:', 'base-dir:', 'template:']);
+
+$missing = [];
+foreach (['files', 'base-dir', 'template'] as $req) {
+    if (empty($opts[$req])) $missing[] = "--$req";
+}
+if ($missing) {
+    fwrite(STDERR, "Error: missing required arguments: " . implode(', ', $missing) . "\n");
+    fwrite(STDERR, "Usage: php check_copyright_pr.php --files <list> --added <list> --base-dir <dir> --template <path>\n");
+    exit(1);
+}
+
+$filesPath    = $opts['files'];
+$addedPath    = $opts['added'] ?? '';
+$baseDir      = rtrim((string) $opts['base-dir'], '/');
+$templatePath = $opts['template'];
+
+if (!file_exists($filesPath)) {
+    echo "No copyright-eligible changed files found — skipping.\n";
+    exit(0);
+}
+
+$template        = trim((string) file_get_contents($templatePath));
+$changedFiles = array_filter(array_map('trim', file($filesPath)));
+$addedFiles   = ($addedPath && file_exists($addedPath))
+    ? array_flip(array_filter(array_map('trim', file($addedPath))))
+    : [];
+
+$currentYear = (int) date('Y');
+$issues  = [];
+$checked = 0;
+$skipped = 0;
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+/**
+ * Normalize a copyright block for comparison: strip XML declarations, PHP
+ * declare(), comment markers, whitespace and punctuation — mirrors the Python
+ * _normalize_copyright() function.
+ */
+function normalizeHeader(string $text): string
+{
+    $text = preg_replace('/<\?xml[^?]*\?>/', '', $text);           // strip XML PI
+    $text = preg_replace('/\bdeclare\s*\([^)]*\)\s*;?/', '', $text); // strip declare()
+    return strtolower((string) preg_replace('/[\s#\/\*\-<>!?\[\]]+/', '', $text));
+}
+
+/**
+ * Returns true when the file should be skipped entirely.
+ */
+function shouldExclude(string $filePath): bool
+{
+    static $allowedExts = ['php','phtml','html','js','xml','xsd','less','css','scss','graphqls'];
+
+    $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
+    if (!in_array($ext, $allowedExts, true)) return true;
+
+    // .github/ and vendor/ are always excluded
+    if (preg_match('#^(\.github|vendor)/#', $filePath)) return true;
+
+    // lib/web/ is excluded except lib/web/mage/ (Adobe-authored JS)
+    if (preg_match('#^lib/web/#', $filePath) && !preg_match('#^lib/web/mage/#', $filePath)) return true;
+
+    return false;
+}
+
+/**
+ * Extract the first copyright block from file content.
+ * Handles C-style (/** ... *\/), HTML (<!-- ... -->), and hash (# ...) blocks.
+ * Returns the raw header text, or '' if no copyright found.
+ */
+function extractCopyrightBlock(string $content): string
+{
+    $lines = explode("\n", $content);
+    $blockType     = null; // 'c', 'html', 'hash'
+    $collected     = [];
+    $foundCopyright = false;
+
+    foreach ($lines as $i => $line) {
+        $s = trim($line);
+
+        // Line 0: skip PHP/XML opening tag but collect it
+        if ($i === 0 && (str_starts_with($s, '<?php') || str_starts_with($s, '<?xml'))) {
+            $collected[] = $line;
+            continue;
+        }
+
+        if ($blockType === null) {
+            if (str_starts_with($s, '/**') || str_starts_with($s, '/*')) {
+                $blockType = 'c';
+                $collected[] = $line;
+                if (strlen($s) > 2 && str_ends_with($s, '*/')) {
+                    $foundCopyright = stripos($s, 'copyright') !== false;
+                    break;
+                }
+                continue;
+            }
+            if (str_starts_with($s, '<!--')) {
+                $blockType = 'html';
+                $collected[] = $line;
+                if (strlen($s) > 4 && str_ends_with($s, '-->')) {
+                    $foundCopyright = stripos($s, 'copyright') !== false;
+                    break;
+                }
+                continue;
+            }
+            if (str_starts_with($s, '#')) {
+                $blockType = 'hash';
+                $collected[] = $line;
+                if (stripos($s, 'copyright') !== false) $foundCopyright = true;
+                continue;
+            }
+            // Empty lines and declare() before the copyright block are allowed
+            if ($s === '') continue;
+            if (preg_match('/^declare\s*\([^)]*\)\s*;?$/', $s)) continue;
+            break;
+        }
+
+        if ($blockType === 'c') {
+            $collected[] = $line;
+            if (stripos($s, 'copyright') !== false) $foundCopyright = true;
+            if (str_ends_with($s, '*/')) {
+                if ($foundCopyright) break;
+                $collected = []; $foundCopyright = false; $blockType = null; // non-copyright block, reset
+            }
+            continue;
+        }
+
+        if ($blockType === 'html') {
+            $collected[] = $line;
+            if (stripos($s, 'copyright') !== false) $foundCopyright = true;
+            if (str_ends_with($s, '-->')) {
+                if ($foundCopyright) break;
+                $collected = []; $foundCopyright = false; $blockType = null;
+            }
+            continue;
+        }
+
+        if ($blockType === 'hash') {
+            if (!str_starts_with($s, '#')) break; // end of hash block
+            if (stripos($s, 'copyright') !== false) $foundCopyright = true;
+            $collected[] = $line;
+            continue;
+        }
+    }
+
+    return $foundCopyright ? implode("\n", $collected) : '';
+}
+
+/**
+ * Fetch the base-branch content of a file from the pre-fetched directory.
+ * Returns null when the file did not exist in the base branch.
+ */
+function getBaseContent(string $filePath, string $baseDir): ?string
+{
+    $path = $baseDir . '/' . $filePath;
+    return file_exists($path) ? (string) file_get_contents($path) : null;
+}
+
+/**
+ * Build the expected copyright header for a given file type using the template.
+ * The template is in /** ... *\/ block format.
+ */
+function buildExpectedHeader(string $template, string $filePath, int $year): string
+{
+    $tpl = str_replace('{{YEAR}}', (string) $year, $template);
+    $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
+
+    // Template is already in /** */ form; adapt wrapping for the file type.
+    // Strip outer /** and */ to get the inner lines.
+    $inner = trim((string) preg_replace('/^\/\*\*\s*|\s*\*\/$/', '', $tpl));
+    $innerLines = explode("\n", $inner);
+    $bodyLines  = array_map(static fn(string $l): string => ltrim($l, ' *'), $innerLines);
+
+    switch ($ext) {
+        case 'php':
+            return "<?php\n" . $tpl . "\n";
+        case 'phtml':
+            return "<?php\n" . $tpl . "\n?>\n";
+        case 'xml':
+        case 'xsd':
+            $out = ['<?xml version="1.0"?>', '<!--'];
+            foreach ($bodyLines as $l) $out[] = $l !== '' ? " * {$l}" : ' *';
+            $out[] = ' -->';
+            return implode("\n", $out) . "\n";
+        case 'graphqls':
+            $out = [];
+            foreach ($bodyLines as $l) $out[] = $l !== '' ? "# {$l}" : '#';
+            return implode("\n", $out) . "\n";
+        case 'html':
+            $out = ['<!--'];
+            foreach ($bodyLines as $l) $out[] = $l !== '' ? " * {$l}" : ' *';
+            $out[] = ' -->';
+            return implode("\n", $out) . "\n";
+        default:
+            return $tpl . "\n";
+    }
+}
+
+// ── Main loop ─────────────────────────────────────────────────────────────────
+
+foreach ($changedFiles as $filePath) {
+    if (shouldExclude($filePath)) {
+        $skipped++;
+        continue;
+    }
+
+    if (!is_file($filePath)) {
+        $skipped++;
+        continue;
+    }
+
+    $content = (string) file_get_contents($filePath);
+
+    // Skip third-party files that contain no Magento/Adobe reference
+    if (strpos($content, 'Magento') === false && strpos($content, 'Adobe') === false
+        && strpos($filePath, 'Magento') === false && strpos($filePath, 'Adobe') === false
+    ) {
+        $skipped++;
+        continue;
+    }
+
+    $checked++;
+    $isNew         = isset($addedFiles[$filePath]);
+    $currentHeader = extractCopyrightBlock($content);
+
+
+    if ($isNew) {
+        // ── New file: must have a copyright header in current-year format ─────
+        if ($currentHeader === '') {
+            $issues[] = [
+                'file'   => $filePath,
+                'reason' => 'Missing copyright header',
+                'new'    => true,
+            ];
+            continue;
+        }
+        $currentNorm  = normalizeHeader($currentHeader);
+        $expected     = buildExpectedHeader($template, $filePath, $currentYear);
+        $expectedNorm = normalizeHeader($expected);
+        if ($expectedNorm !== '' && strpos($currentNorm, $expectedNorm) === false) {
+            $issues[] = [
+                'file'   => $filePath,
+                'reason' => "New file: copyright header must use year {$currentYear} in the correct format",
+                'new'    => true,
+            ];
+        }
+    } else {
+        // ── Existing file: compare against base; skip if base had no copyright ─
+        $baseContent = getBaseContent($filePath, $baseDir);
+
+        if ($baseContent === null) {
+            // Modified file but base blob unavailable (partial clone fetch failure).
+            // Skip rather than emit a false positive.
+            echo "  [SKIP] {$filePath} — base content unavailable (partial clone fetch failure)\n";
+            $skipped++;
+            continue;
+        }
+
+        $baseHeader = extractCopyrightBlock($baseContent);
+        if ($baseHeader === '') {
+            continue;
+        }
+
+        if ($currentHeader === '') {
+            $issues[] = [
+                'file'   => $filePath,
+                'reason' => 'Copyright header was removed in this PR',
+                'new'    => false,
+            ];
+            continue;
+        }
+
+        $baseNorm    = normalizeHeader($baseHeader);
+        $currentNorm = normalizeHeader($currentHeader);
+        if ($baseNorm !== $currentNorm) {
+            $issues[] = [
+                'file'   => $filePath,
+                'reason' => 'Copyright header was modified in this PR (year or content changed)',
+                'new'    => false,
+            ];
+        }
+    }
+}
+
+// ── Report ────────────────────────────────────────────────────────────────────
+
+echo "Copyright check: {$checked} file(s) checked, {$skipped} skipped\n";
+
+if (empty($issues)) {
+    echo "All files have correct copyright headers\n";
+    exit(0);
+}
+
+echo count($issues) . " file(s) have copyright issues:\n";
+foreach ($issues as $issue) {
+    $tag = $issue['new'] ? '[NEW]    ' : '[EXISTING]';
+    echo "  {$tag} {$issue['file']}\n";
+    echo "           {$issue['reason']}\n";
+}
+exit(1);
diff --git a/.github/scripts/copyright-template.txt b/.github/scripts/copyright-template.txt
new file mode 100644
index 000000000000..74dfda828bcf
--- /dev/null
+++ b/.github/scripts/copyright-template.txt
@@ -0,0 +1,4 @@
+/**
+ * Copyright {{YEAR}} Adobe
+ * All Rights Reserved.
+ */
diff --git a/.github/scripts/dist-qa-local.sh b/.github/scripts/dist-qa-local.sh
index e5999f99588a..2056a66fda7e 100755
--- a/.github/scripts/dist-qa-local.sh
+++ b/.github/scripts/dist-qa-local.sh
@@ -28,12 +28,15 @@ fi
 
 echo "Base ref: $BASE"
 
+# .github/ is excluded: it carries CI tooling inherited from upstream (CLI scripts that
+# legitimately use echo/exit), which the Magento2 standard rejects and which is not part
+# of the distributed code.
 CHANGED=$(
     {
-        git diff --name-only --diff-filter=ACMR "$BASE"...HEAD -- '*.php'
-        git diff --name-only --diff-filter=ACMR -- '*.php'
-        git diff --name-only --diff-filter=ACMR --cached -- '*.php'
-        git ls-files --others --exclude-standard -- '*.php'
+        git diff --name-only --diff-filter=ACMR "$BASE"...HEAD -- '*.php' ':(exclude).github/'
+        git diff --name-only --diff-filter=ACMR -- '*.php' ':(exclude).github/'
+        git diff --name-only --diff-filter=ACMR --cached -- '*.php' ':(exclude).github/'
+        git ls-files --others --exclude-standard -- '*.php' ':(exclude).github/'
     } 2>/dev/null | sort -u | grep -v '^$' || true
 )
 
diff --git a/.github/scripts/read-pkg-constraint.sh b/.github/scripts/read-pkg-constraint.sh
new file mode 100755
index 000000000000..c74113e48561
--- /dev/null
+++ b/.github/scripts/read-pkg-constraint.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Copyright 2026 Adobe
+# All Rights Reserved.
+#
+# Usage: read-pkg-constraint.sh <composer.json> <package/name>
+# Prints the version constraint for the package from require or require-dev.
+set -euo pipefail
+
+FILE="$1"
+PKG="$2"
+
+[ -f "$FILE" ] || exit 1
+
+php -r '
+  $j = json_decode(file_get_contents($argv[1]), true) ?: [];
+  $p = $argv[2];
+  $v = $j["require"][$p] ?? $j["require-dev"][$p] ?? "";
+  echo is_string($v) ? $v : "";
+' "$FILE" "$PKG"
diff --git a/.github/scripts/resolve_magento_tool_constraints.py b/.github/scripts/resolve_magento_tool_constraints.py
new file mode 100755
index 000000000000..36704ded58e0
--- /dev/null
+++ b/.github/scripts/resolve_magento_tool_constraints.py
@@ -0,0 +1,306 @@
+#!/usr/bin/env python3
+#
+# Copyright 2026 Adobe
+# All Rights Reserved.
+#
+"""
+Resolve PHP version + magento/magento2 composer.json the same way as pr-quality-gates.yml.
+
+Used in GitHub Actions (writes GITHUB_OUTPUT and /tmp/magento2-composer.json) and locally:
+
+  REPO_NAME=magento2ce BASE_REF=2.4-develop \\
+    python3 .github/scripts/resolve_magento_tool_constraints.py --print-summary
+
+See emulate_ci_tools_locally.sh for a full local QA-tools install.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import re
+import sys
+import urllib.request
+from pathlib import Path
+from typing import Any
+
+
+def parse_php_constraint(text: str) -> str:
+    matches = re.findall(r"\b8\.(\d+)\b", text or "")
+    if not matches:
+        return ""
+    highest_minor = max(int(m) for m in matches)
+    return f"8.{highest_minor}"
+
+
+def load_json_url(url: str) -> Any:
+    with urllib.request.urlopen(url) as resp:
+        return json.load(resp)
+
+
+def read_pkg_constraint(data: dict[str, Any], pkg: str) -> str:
+    req = data.get("require") or {}
+    dev = data.get("require-dev") or {}
+    v = req.get(pkg) or dev.get(pkg)
+    return v if isinstance(v, str) else ""
+
+
+def resolve(
+    repo_name: str,
+    base_ref: str,
+    fallback_php: str,
+) -> tuple[str, str, dict[str, Any] | None, str]:
+    """
+    Returns (php_version, source_ref, composer_json_data, raw_php_constraint_or_empty).
+    """
+    selected_release = ""
+    package_key = os.environ.get("REPO_PACKAGE_KEY", "")
+    base_ref = (base_ref or "").strip()
+
+    def base_ref_candidates(ref: str) -> list[str]:
+        """
+        Build lookup candidates for branch-like refs.
+        Examples:
+        - 2.4.8-p3-develop -> [2.4.8-p3-develop, 2.4.8-p3]
+        - 1.2.6-p2-release -> [1.2.6-p2-release, 1.2.6-p2]
+        """
+        if not ref:
+            return []
+        out = [ref]
+        if ref.endswith("-develop"):
+            trimmed = ref[: -len("-develop")]
+            if trimmed:
+                out.append(trimmed)
+        if ref.endswith("-release"):
+            trimmed = ref[: -len("-release")]
+            if trimmed:
+                out.append(trimmed)
+        return list(dict.fromkeys(out))
+
+    selected_component_version = ""
+    try:
+        releases = load_json_url(
+            "https://raw.githubusercontent.com/magento/quality-patches/master/magento_releases.json"
+        )
+        if package_key:
+            release_lookup_refs = base_ref_candidates(base_ref)
+
+            for candidate_ref in release_lookup_refs:
+                if candidate_ref in releases:
+                    selected_release = candidate_ref
+                    break
+
+            if not selected_release and release_lookup_refs:
+
+                def sort_key(v: str) -> tuple:
+                    m = re.match(r"^(\d+\.\d+\.\d+)(?:-p(\d+))?$", v)
+                    if not m:
+                        return (v, -1)
+                    return (m.group(1), int(m.group(2) or 0))
+
+                for candidate_ref in release_lookup_refs:
+                    release_candidates = [
+                        key
+                        for key in releases
+                        if key == candidate_ref or key.startswith(f"{candidate_ref}-p")
+                    ]
+                    if release_candidates:
+                        selected_release = sorted(release_candidates, key=sort_key)[-1]
+                        break
+
+            if selected_release:
+                selected_component_version = (
+                    releases.get(selected_release, {}).get(package_key, "") or ""
+                )
+    except Exception as exc:
+        print(f"Could not read magento_releases.json: {exc}", file=sys.stderr)
+
+    if selected_release:
+        print(f"Resolved Magento release from quality-patches metadata: {selected_release}")
+        if selected_component_version:
+            print(f"Resolved component version for {package_key}: {selected_component_version}")
+    else:
+        print(
+            f"No release mapping found for repo '{repo_name}' and base ref '{base_ref}'."
+        )
+        print("Falling back to develop-branch context: 2.4-develop / develop")
+
+    composer_refs: list[str] = []
+    if selected_release:
+        composer_refs.append(selected_release)
+    composer_refs.extend(["2.4-develop", "develop"])
+
+    constraint = ""
+    source_ref = ""
+    composer_json_data: dict[str, Any] | None = None
+
+    for ref in composer_refs:
+        try:
+            with urllib.request.urlopen(
+                f"https://raw.githubusercontent.com/magento/magento2/{ref}/composer.json"
+            ) as resp:
+                data = json.load(resp)
+        except Exception:
+            continue
+        candidate = (
+            data.get("config", {}).get("platform", {}).get("php")
+            or data.get("require", {}).get("php")
+            or ""
+        )
+        if candidate:
+            constraint = candidate
+            source_ref = ref
+            composer_json_data = data
+            break
+
+    if composer_json_data is None:
+        for ref in composer_refs:
+            try:
+                with urllib.request.urlopen(
+                    f"https://raw.githubusercontent.com/magento/magento2/{ref}/composer.json"
+                ) as resp:
+                    data = json.load(resp)
+                composer_json_data = data
+                source_ref = ref
+                print(
+                    f"Loaded magento/magento2 composer.json from ref '{ref}' "
+                    "(no PHP platform/require match)."
+                )
+                break
+            except Exception:
+                continue
+
+    if composer_json_data is None:
+        try:
+            with urllib.request.urlopen(
+                "https://api.github.com/repos/magento/magento2"
+            ) as resp:
+                meta = json.load(resp)
+            default_branch = meta.get("default_branch") or "2.4-develop"
+            with urllib.request.urlopen(
+                f"https://raw.githubusercontent.com/magento/magento2/{default_branch}/composer.json"
+            ) as resp:
+                composer_json_data = json.load(resp)
+            source_ref = default_branch
+            print(
+                f"Fell back to magento/magento2 default branch '{default_branch}' for composer.json."
+            )
+        except Exception as exc:
+            print(f"Could not load magento/magento2 composer.json: {exc}", file=sys.stderr)
+
+    if constraint:
+        version = parse_php_constraint(constraint) or fallback_php
+        print(f"Resolved PHP constraint from magento/magento2 ref '{source_ref}': {constraint}")
+    else:
+        version = fallback_php
+        print(
+            "No usable PHP constraint found from selected tag or fallback refs, "
+            f"falling back to PHP {fallback_php}"
+        )
+
+    print(f"Selected PHP version: {version}")
+    return version, source_ref, composer_json_data, constraint
+
+
+def merge_tool_constraints(
+    magento_data: dict[str, Any] | None,
+    mcs_composer_path: Path | None,
+) -> tuple[str, str]:
+    phpmd_c = ""
+    stan_c = ""
+    if mcs_composer_path and mcs_composer_path.is_file():
+        try:
+            mcs = json.loads(mcs_composer_path.read_text(encoding="utf-8"))
+            phpmd_c = read_pkg_constraint(mcs, "phpmd/phpmd")
+            stan_c = read_pkg_constraint(mcs, "phpstan/phpstan")
+        except Exception as exc:
+            print(f"Could not read {mcs_composer_path}: {exc}", file=sys.stderr)
+    if magento_data:
+        if not phpmd_c:
+            phpmd_c = read_pkg_constraint(magento_data, "phpmd/phpmd")
+        if not stan_c:
+            stan_c = read_pkg_constraint(magento_data, "phpstan/phpstan")
+    return phpmd_c, stan_c
+
+
+def main() -> int:
+    p = argparse.ArgumentParser(description=__doc__)
+    p.add_argument(
+        "--repo-name",
+        default=os.environ.get("REPO_NAME", ""),
+        help="GitHub repository name (e.g. magento2ce). Env: REPO_NAME",
+    )
+    p.add_argument(
+        "--base-ref",
+        default=os.environ.get("BASE_REF", ""),
+        help="PR base branch / release ref (e.g. 2.4.8-p3). Env: BASE_REF",
+    )
+    p.add_argument(
+        "--output",
+        default=os.environ.get("MAGENTO_COMPOSER_JSON", "/tmp/magento2-composer.json"),
+        help="Where to write magento/magento2 composer.json",
+    )
+    p.add_argument(
+        "--fallback-php",
+        default="8.3",
+        help="PHP minor fallback when constraint cannot be parsed",
+    )
+    p.add_argument(
+        "--mcs-composer",
+        type=Path,
+        default=None,
+        help="Optional path to mcs/composer.json for tool constraint merge",
+    )
+    p.add_argument(
+        "--print-summary",
+        action="store_true",
+        help="Print phpmd/phpstan constraints after resolution",
+    )
+    args = p.parse_args()
+
+    php_version, source_ref, composer_json_data, _ = resolve(
+        args.repo_name, args.base_ref, args.fallback_php
+    )
+
+    out_path = Path(args.output)
+    if composer_json_data is not None:
+        out_path.parent.mkdir(parents=True, exist_ok=True)
+        out_path.write_text(
+            json.dumps(composer_json_data, indent=2) + "\n", encoding="utf-8"
+        )
+        print(
+            f"Wrote {out_path} from magento/magento2 ref '{source_ref}' (for PHPMD/PHPStan pins)."
+        )
+    else:
+        print("ERROR: No composer.json data to write.", file=sys.stderr)
+        return 1
+
+    github_output = os.environ.get("GITHUB_OUTPUT")
+    if github_output:
+        outp = Path(github_output)
+        with outp.open("a", encoding="utf-8") as fh:
+            fh.write(f"php_version={php_version}\n")
+            if source_ref:
+                fh.write(f"magento_composer_ref={source_ref}\n")
+
+    mcs_path = args.mcs_composer
+    if mcs_path is None:
+        env_mcs = os.environ.get("MCS_COMPOSER")
+        if env_mcs:
+            mcs_path = Path(env_mcs)
+
+    if args.print_summary or not github_output:
+        phpmd_c, stan_c = merge_tool_constraints(composer_json_data, mcs_path)
+        print("")
+        print("--- Tool constraints (mcs first, then magento2 composer) ---")
+        print(f"magento_composer_ref={source_ref}")
+        print(f"php_version={php_version}")
+        print(f"phpmd_constraint={phpmd_c or '(missing)'}")
+        print(f"phpstan_constraint={stan_c or '(missing)'}")
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/.github/scripts/run-phpcs.sh b/.github/scripts/run-phpcs.sh
new file mode 100755
index 000000000000..61c2ea8ce2ee
--- /dev/null
+++ b/.github/scripts/run-phpcs.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Copyright 2026 Adobe
+# All Rights Reserved.
+#
+# Usage: run-phpcs.sh <label> <file-list> [phpcs-flags...]
+set -euo pipefail
+
+LABEL="$1"
+FILE_LIST="$2"
+shift 2
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+if [ ! -s "$FILE_LIST" ]; then
+  echo "No $LABEL files to check, skipping phpcs."
+  exit 0
+fi
+
+phpcs_tmp=$(mktemp)
+phpcs_exit=0
+mcs/vendor/bin/phpcs \
+  --standard="${PHPCS_STANDARD:-Magento2}" \
+  "$@" \
+  --report=full \
+  --no-colors \
+  --report-width=200 \
+  --file-list="$FILE_LIST" > "$phpcs_tmp" 2>/dev/null || phpcs_exit=$?
+
+if [ $phpcs_exit -eq 0 ] && grep -qE "^FOUND [0-9]+ (ERROR|WARNING)" "$phpcs_tmp"; then phpcs_exit=1; fi
+grep -vE \
+  '^DEPRECATED: |sniff is listening for |^WARNING: The Magento2 standard uses [0-9]+ deprecated|^-  [A-Za-z]|^   This sniff has been deprecated|^   Support for scanning|^Deprecated sniffs are still run|^future\.$' \
+  "$phpcs_tmp" || true
+rm -f "$phpcs_tmp"
+exit $phpcs_exit
diff --git a/.github/workflows/dist-qa.yml b/.github/workflows/dist-qa.yml
index eba29c18e6dd..d39c02296761 100644
--- a/.github/workflows/dist-qa.yml
+++ b/.github/workflows/dist-qa.yml
@@ -40,7 +40,9 @@ jobs:
         id: changed
         run: |
           git fetch --no-tags --depth=1 origin "${{ github.base_ref }}"
-          git diff --name-only --diff-filter=ACMR "origin/${{ github.base_ref }}...HEAD" -- '*.php' > changed.txt || true
+          # .github/ is excluded: it carries CI tooling inherited from upstream (CLI scripts
+          # that legitimately use echo/exit) and is not part of the distributed code.
+          git diff --name-only --diff-filter=ACMR "origin/${{ github.base_ref }}...HEAD" -- '*.php' ':(exclude).github/' > changed.txt || true
           echo "Changed PHP files:"
           cat changed.txt || true
           echo "count=$(grep -c . changed.txt || echo 0)" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/pr-quality-gates.yml b/.github/workflows/pr-quality-gates.yml
new file mode 100644
index 000000000000..1f4357507549
--- /dev/null
+++ b/.github/workflows/pr-quality-gates.yml
@@ -0,0 +1,1113 @@
+#
+# Copyright 2026 Adobe
+# All Rights Reserved.
+#
+
+name: PR Quality Gates
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches:
+      - "*"
+
+# Repository variables used by this workflow:
+# - PR_QA_ENABLED_JOBS: CSV list of top-level jobs to run.
+#   Supported values: coding-standard,aggregate-linked-pr-checks
+# - PR_QA_CODING_STANDARD_ENABLED_CHECKS: CSV list of coding-standard sub-checks.
+#   Empty or includes "all" => run all sub-checks.
+#   Supported values:
+#   all,php-lint,phpcs,phpcs-xml,xml-lint,phpcs-html,phpcs-graphql,phpcs-less,
+#   phpmd,strict-types,fixture-reuse,eslint
+
+jobs:
+  # ──────────────────────────────────────────────────────────────────────
+  # Single job: mainline alignment + change detection + coding standard
+  # + linked-PR aggregate gate, run sequentially so the PR shows one check.
+  # ──────────────────────────────────────────────────────────────────────
+  pr-quality-gates:
+    if: >-
+      github.event_name == 'pull_request' &&
+      vars.PR_QA_ENABLED_JOBS != ''
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    permissions:
+      contents: read
+      pull-requests: read
+      checks: read
+      statuses: read
+    env:
+      HAS_CROSS_REPO_TOKEN: ${{ secrets.CROSS_REPO_READ_TOKEN != '' }}
+    steps:
+
+      # ── Mainline alignment ──────────────────────────────────────────
+      - name: Check branch alignment with upstream mainline
+        id: mainline
+        env:
+          GH_TOKEN: ${{ github.token }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -euo pipefail
+          base_branch="$BASE_REF"
+          head_sha="$HEAD_SHA"
+          repo="${{ github.repository }}"
+          owner="${repo%%/*}"
+          echo "Base branch : ${base_branch}"
+          echo "Head SHA    : ${head_sha}"
+
+          # Resolve upstream (parent) repo; fall back to origin if not a fork
+          upstream_owner="$owner"
+          upstream_repo="${repo##*/}"
+          upstream_label="$repo"
+          meta=$(gh api "repos/${repo}" \
+            --jq '[.fork, (.parent.owner.login // ""), (.parent.name // ""), (.parent.full_name // "")] | @tsv' \
+            2>/dev/null || echo "false		")
+          IFS=$'\t' read -r is_fork p_owner p_repo p_label <<< "$meta"
+          if [[ "$is_fork" == "true" && -n "$p_owner" ]]; then
+            upstream_owner="$p_owner"
+            upstream_repo="$p_repo"
+            upstream_label="$p_label"
+            echo "Upstream    : ${upstream_label} (parent fork)"
+          fi
+
+          # Get upstream mainline HEAD SHA; fall back to origin on error
+          if ! mainline_sha=$(gh api "repos/${upstream_owner}/${upstream_repo}/git/ref/heads/${base_branch}" \
+              --jq '.object.sha' 2>/dev/null); then
+            echo "::warning::Cannot reach ${upstream_label}/${base_branch}. Falling back to origin."
+            upstream_owner="$owner"
+            upstream_repo="${repo##*/}"
+            upstream_label="$repo"
+            mainline_sha=$(gh api "repos/${repo}/git/ref/heads/${base_branch}" --jq '.object.sha')
+          fi
+          echo "Mainline HEAD (${upstream_label} ${base_branch}): ${mainline_sha}"
+
+          # ── 1. Freshness check ──────────────────────────────────────────
+          cmp=$(gh api "repos/${repo}/compare/${mainline_sha}...${head_sha}" \
+            --jq '[.behind_by, .ahead_by, .status, (.merge_base_commit.commit.committer.date // "")] | @tsv')
+          IFS=$'\t' read -r behind ahead cmp_status merge_base_date <<< "$cmp"
+          echo "Status: ${cmp_status}, behind_by: ${behind}, ahead_by: ${ahead}"
+
+          if [[ "$behind" -gt 0 ]]; then
+            if [[ "$upstream_owner" != "$owner" ]]; then
+              fetch_cmd="git fetch upstream ${base_branch} && git merge upstream/${base_branch}"
+            else
+              fetch_cmd="git fetch origin ${base_branch} && git merge origin/${base_branch}"
+            fi
+            echo "::error::Branch is ${behind} commit(s) behind ${upstream_label} ${base_branch}.%0A%0AMerge the latest mainline before CI builds (PAT, MFTF, integration tests) will run.%0A%0ATo fix:%0A  ${fetch_cmd}%0A  git push"
+            exit 1
+          fi
+
+          # ── 2. Conflict check ───────────────────────────────────────────
+          mergeable=$(gh api "repos/${repo}/pulls/${PR_NUMBER}" \
+            --jq '.mergeable')
+          if [[ "$mergeable" == "false" ]]; then
+            echo "::error::Merge conflicts detected between this branch and ${upstream_label} ${base_branch}. Merge mainline and resolve conflicts before CI can proceed."
+            exit 1
+          fi
+          [[ "$mergeable" == "null" ]] && echo "::warning::GitHub has not yet computed mergeability. Conflict check skipped."
+
+          # ── 3. Staleness warning ────────────────────────────────────────
+          if [[ -n "$merge_base_date" && "$merge_base_date" != "null" ]]; then
+            now=$(date +%s)
+            base_epoch=$(date -d "$merge_base_date" +%s 2>/dev/null || echo "")
+            if [[ -n "$base_epoch" ]]; then
+              age_days=$(( (now - base_epoch) / 86400 ))
+              [[ "$age_days" -gt 7 ]] && echo "::warning::Branch diverged from ${upstream_label} ${base_branch} ${age_days} days ago. Consider rebasing."
+              echo "Branch is up to date with ${upstream_label} ${base_branch} (diverged ${age_days} day(s) ago). All good."
+            fi
+          else
+            echo "Branch is up to date with ${upstream_label} ${base_branch}. All good."
+          fi
+
+      # ── Detect changed files ────────────────────────────────────────
+      - name: Detect changed files and verify CI integrity
+        id: check
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+          BASE_REPO: ${{ github.event.pull_request.base.repo.full_name }}
+        run: |
+          set -euo pipefail
+          pr="$PR_NUMBER"
+          repo="${{ github.repository }}"
+          echo "PR #${pr}  ${HEAD_REPO} → ${BASE_REPO}"
+          echo "PR_QA_ENABLED_JOBS: ${{ vars.PR_QA_ENABLED_JOBS }}"
+
+          # Fetch all changed files as "filename TAB status" pairs (paginated)
+          files=$(gh api "repos/${repo}/pulls/${pr}/files" --paginate \
+            --jq '.[] | [.filename, .status] | @tsv')
+
+          # Verify required CI files are not removed in this PR
+          required=(
+            .github/workflows/pr-quality-gates.yml
+            .github/scripts/copyright-template.txt
+          )
+          missing=false
+          while IFS=$'\t' read -r filename status; do
+            [[ "$status" != "removed" ]] && continue
+            for req in "${required[@]}"; do
+              if [[ "$filename" == "$req" ]]; then
+                echo "::error::Required CI file removed: $filename"
+                missing=true
+              fi
+            done
+          done <<< "$files"
+          if $missing; then echo "::error::Restore removed CI files before merging."; exit 1; fi
+
+          # Categorize files (exclude .github/, vendor/, lib/web/ except lib/web/mage/)
+          # lib/web/ contains vendored third-party JS/CSS (jQuery, RequireJS, etc.)
+          # lib/web/mage/ is Adobe-authored JS and is included.
+          has_php=false; has_js=false; has_static=false
+          has_new_files=false; has_copyright_files=false
+          copyright_files=""
+          copyright_exts='\.(php|phtml|js|css|scss|less|xml|xsd|html|graphqls)$'
+          count_new=0; count_modified=0; count_removed=0
+          php_list=""; js_list=""; xml_list=""; html_list=""
+          graphql_list=""; less_list=""; new_php_list=""; copyright_added_list=""
+
+          while IFS=$'\t' read -r filename status; do
+            [[ -z "$filename" ]] && continue
+            [[ "$filename" =~ ^(\.github|vendor)/ ]] && continue
+            [[ "$filename" =~ ^lib/web/ && ! "$filename" =~ ^lib/web/mage/ ]] && continue
+            case "$status" in
+              added)                    count_new=$((count_new + 1)) ;;
+              modified|renamed|copied)  count_modified=$((count_modified + 1)) ;;
+              removed)                  count_removed=$((count_removed + 1)) ;;
+            esac
+            [[ "$filename" =~ \.(php|phtml)$ ]]                                        && has_php=true
+            [[ "$filename" =~ \.js$ && ! "$filename" =~ \.min\.js$ ]]                 && has_js=true
+            [[ "$filename" =~ \.(xml|xsd|html|graphqls|less)$ ]]                      && has_static=true
+            if [[ "$status" =~ ^(added|modified|renamed|copied)$ ]]; then
+              [[ "$filename" =~ \.(php|phtml)$ ]] && php_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.js$ && ! "$filename" =~ \.min\.js$ ]] && js_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.(xml|xsd)$ ]] && xml_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.html$ ]] && html_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.graphqls$ ]] && graphql_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.less$ ]] && less_list+="${filename}"$'\n'
+              [[ "$filename" =~ \.php$ && "$status" == "added" ]] && new_php_list+="${filename}"$'\n'
+            fi
+            if [[ "$filename" =~ $copyright_exts && "$status" =~ ^(added|modified|renamed|copied)$ ]]; then
+              has_copyright_files=true
+              copyright_files+="${filename}"$'\n'
+              if [[ "$status" =~ ^(added|renamed|copied)$ ]]; then
+                has_new_files=true
+                copyright_added_list+="${filename}"$'\n'
+              fi
+            fi
+          done <<< "$files"
+          copyright_files="${copyright_files%$'\n'}"
+
+          # Write file lists for coding-standard checks (avoids git diff in later steps)
+          [ -n "$php_list" ]             && printf '%s\n' "${php_list%$'\n'}"              > /tmp/changed_php.txt
+          [ -n "$js_list" ]              && printf '%s\n' "${js_list%$'\n'}"               > /tmp/changed_js.txt
+          [ -n "$xml_list" ]             && printf '%s\n' "${xml_list%$'\n'}"              > /tmp/changed_xml.txt
+          [ -n "$html_list" ]            && printf '%s\n' "${html_list%$'\n'}"             > /tmp/changed_html.txt
+          [ -n "$graphql_list" ]         && printf '%s\n' "${graphql_list%$'\n'}"          > /tmp/changed_graphqls.txt
+          [ -n "$less_list" ]            && printf '%s\n' "${less_list%$'\n'}"             > /tmp/changed_less.txt
+          [ -n "$new_php_list" ]         && printf '%s\n' "${new_php_list%$'\n'}"          > /tmp/new_php.txt
+          [ -n "$copyright_files" ]      && printf '%s\n' "$copyright_files"               > /tmp/copyright_changed.txt
+          [ -n "$copyright_added_list" ] && printf '%s\n' "${copyright_added_list%$'\n'}" > /tmp/copyright_added.txt
+
+          echo "has_php=$has_php"                         >> "$GITHUB_OUTPUT"
+          echo "has_js=$has_js"                           >> "$GITHUB_OUTPUT"
+          echo "has_static=$has_static"                   >> "$GITHUB_OUTPUT"
+          echo "has_new_files=$has_new_files"             >> "$GITHUB_OUTPUT"
+          echo "has_copyright_files=$has_copyright_files" >> "$GITHUB_OUTPUT"
+          {
+            echo "copyright_files<<EOF"
+            echo "$copyright_files"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+          count_total=$((count_new + count_modified + count_removed))
+          echo "PHP files changed: $has_php"
+          echo "JS files changed: $has_js"
+          echo "Static files changed: $has_static"
+          echo "Copyright-eligible files changed: $has_copyright_files"
+          echo "Files: ${count_total} total  |  ${count_new} new  |  ${count_modified} modified  |  ${count_removed} deleted"
+
+      - name: Set file type env vars
+        run: |
+          echo "HAS_PHP=${{ steps.check.outputs.has_php }}"                          >> "$GITHUB_ENV"
+          echo "HAS_JS=${{ steps.check.outputs.has_js }}"                            >> "$GITHUB_ENV"
+          echo "HAS_STATIC=${{ steps.check.outputs.has_static }}"                    >> "$GITHUB_ENV"
+          echo "HAS_COPYRIGHT_FILES=${{ steps.check.outputs.has_copyright_files }}"  >> "$GITHUB_ENV"
+          echo "HAS_PHP_OR_STATIC=${{ steps.check.outputs.has_php == 'true' || steps.check.outputs.has_static == 'true' }}" >> "$GITHUB_ENV"
+
+      # ── Coding standard ─────────────────────────────────────────────
+      - uses: actions/checkout@v6
+        if: >-
+          contains(format(',{0},', vars.PR_QA_ENABLED_JOBS), ',coding-standard,') &&
+          (env.HAS_PHP == 'true' || env.HAS_JS == 'true' || env.HAS_STATIC == 'true')
+        with:
+          fetch-depth: 1
+          filter: blob:none
+          sparse-checkout: .github
+          sparse-checkout-cone-mode: true
+
+      - name: Resolve PHP version from repository composer.json
+        id: php-version
+        if: env.HAS_PHP_OR_STATIC == 'true'
+        env:
+          REPO_NAME: ${{ github.event.repository.name }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          REPO_PACKAGE_KEY: magento/inventory-metapackage
+        run: python3 .github/scripts/resolve_magento_tool_constraints.py
+
+      - name: Setup PHP
+        if: env.HAS_PHP_OR_STATIC == 'true'
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
+        with:
+          php-version: ${{ steps.php-version.outputs.php_version }}
+          tools: composer
+          extensions: simplexml, dom
+
+      - name: Setup Node.js
+        if: env.HAS_JS == 'true'
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+
+      - name: Install Magento Coding Standard
+        id: install-mcs
+        if: >-
+          contains(format(',{0},', vars.PR_QA_ENABLED_JOBS), ',coding-standard,') &&
+          (env.HAS_PHP == 'true' || env.HAS_JS == 'true' || env.HAS_STATIC == 'true')
+        run: |
+          set -euo pipefail
+
+          if [ "$HAS_PHP_OR_STATIC" = "true" ]; then
+            composer create-project --no-interaction --no-progress --stability=dev --remove-vcs magento/magento-coding-standard:dev-develop mcs
+            cd mcs && npm install && cd "${GITHUB_WORKSPACE}"
+
+            echo "PHPCS installed standards:"
+            mcs/vendor/bin/phpcs -i
+
+            # PHPMD version: same magento/magento2 composer.json as PHP version
+            # resolution (quality-patches release → magento2 refs), written by the
+            # "Resolve PHP version" step to /tmp/magento2-composer.json.
+            if [ ! -f /tmp/magento2-composer.json ]; then
+              echo "::error::Missing /tmp/magento2-composer.json — the Resolve PHP version step must run first."
+              exit 1
+            fi
+            echo "Magento CE composer.json for tool pins (ref: ${{ steps.php-version.outputs.magento_composer_ref }})"
+
+            phpmd_constraint=""
+            for src in \
+              "${GITHUB_WORKSPACE}/mcs/composer.json" \
+              "/tmp/magento2-composer.json"; do
+              [ -f "$src" ] || continue
+              [ -z "$phpmd_constraint" ] && phpmd_constraint="$("${GITHUB_WORKSPACE}/.github/scripts/read-pkg-constraint.sh" "$src" "phpmd/phpmd" || true)"
+              [ -n "$phpmd_constraint" ] && break
+            done
+
+            if [ -z "$phpmd_constraint" ]; then
+              echo "::error::Could not resolve phpmd/phpmd from mcs/composer.json or /tmp/magento2-composer.json."
+              exit 1
+            fi
+            echo "Resolved phpmd/phpmd constraint: $phpmd_constraint"
+
+            mkdir -p qa-tools
+            cd qa-tools
+            composer init --name=local/qa-tools --no-interaction
+            composer config minimum-stability dev
+            composer config prefer-stable true
+            composer require --dev --no-interaction --no-progress --with-all-dependencies \
+              "phpmd/phpmd:${phpmd_constraint}"
+          elif [ "$HAS_JS" = "true" ]; then
+            git clone --depth 1 --no-tags \
+              https://github.com/magento/magento-coding-standard.git mcs
+            cd mcs && npm install && cd "${GITHUB_WORKSPACE}"
+          fi
+          echo "ready=true" >> "$GITHUB_OUTPUT"
+
+      - name: Resolve enabled checks
+        id: gate
+        if: steps.install-mcs.outputs.ready == 'true'
+        run: |
+          set -euo pipefail
+          ENABLED="${{ vars.PR_QA_CODING_STANDARD_ENABLED_CHECKS }}"
+          is_enabled() {
+            local check="$1"
+            [ -z "$ENABLED" ] && echo "true" && return
+            echo ",$ENABLED," | grep -qF ",all," && echo "true" && return
+            echo ",$ENABLED," | grep -qF ",$check," && echo "true" && return
+            echo "false"
+          }
+          for check in php-lint phpcs phpcs-xml xml-lint phpcs-html phpcs-graphql phpcs-less phpmd strict-types fixture-reuse eslint; do
+            key="${check//-/_}"
+            echo "${key}=$(is_enabled "$check")" >> "$GITHUB_OUTPUT"
+          done
+
+      - name: Print resolved tool version map
+        if: env.HAS_PHP_OR_STATIC == 'true'
+        env:
+          REPO_NAME: ${{ github.event.repository.name }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          MAGENTO_COMPOSER_REF: ${{ steps.php-version.outputs.magento_composer_ref }}
+          PHP_VERSION_OUT: ${{ steps.php-version.outputs.php_version }}
+        run: |
+          set -euo pipefail
+          phpmd_mcs="$(.github/scripts/read-pkg-constraint.sh "${GITHUB_WORKSPACE}/mcs/composer.json" "phpmd/phpmd" || true)"
+          phpmd_m2="$(.github/scripts/read-pkg-constraint.sh "/tmp/magento2-composer.json" "phpmd/phpmd" || true)"
+
+          echo "=== Resolved Tool Version Map ==="
+          echo "repo_name=${REPO_NAME}"
+          echo "base_ref=${BASE_REF}"
+          echo "magento_composer_ref=${MAGENTO_COMPOSER_REF}"
+          echo "php_version=${PHP_VERSION_OUT}"
+          echo "phpmd_constraint_from_mcs=${phpmd_mcs:-<missing>}"
+          echo "phpmd_constraint_from_magento2=${phpmd_m2:-<missing>}"
+
+      - name: Fetch Magento static PHPMD framework
+        id: fetch-static
+        continue-on-error: true
+        if: env.HAS_PHP_OR_STATIC == 'true' || env.HAS_JS == 'true'
+        env:
+          MAGENTO_COMPOSER_REF: ${{ steps.php-version.outputs.magento_composer_ref }}
+        run: |
+          set -euo pipefail
+          ref="${MAGENTO_COMPOSER_REF}"
+          if [ -z "$ref" ]; then
+            ref="2.4-develop"
+          fi
+          target="/tmp/magento2-static"
+          rm -rf "$target"
+          git clone --depth 1 --filter=blob:none --sparse \
+            --branch "$ref" \
+            https://github.com/magento/magento2.git \
+            "$target"
+          cd "$target"
+          git sparse-checkout set \
+            dev/tests/static/framework \
+            dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd \
+            dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist \
+            dev/tests/static/testsuite/Magento/Test/Js/_files/whitelist \
+            dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist \
+            lib/internal/Magento/Framework
+
+          echo "Fetched Magento static PHPMD framework from ref: $ref"
+          echo "ready=true" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout changed files and fetch base commit
+        id: files
+        if: steps.install-mcs.outputs.ready == 'true'
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+        run: |
+          set -euo pipefail
+          base_sha="$BASE_SHA"
+          echo "base_sha=$base_sha" >> "$GITHUB_ENV"
+          git fetch --filter=blob:none --depth=1 origin "$base_sha" 2>/dev/null || true
+
+          # Deduplicate across all file lists so each blob is fetched exactly once.
+          # Use `cat "$f"; echo` to ensure a newline after each file's content —
+          # without it, the last entry of one list concatenates with the first of the next.
+          all_files=$(mktemp)
+          for f in /tmp/changed_php.txt /tmp/changed_js.txt /tmp/changed_xml.txt \
+                   /tmp/changed_html.txt /tmp/changed_graphqls.txt /tmp/changed_less.txt \
+                   /tmp/copyright_changed.txt; do
+            [ -f "$f" ] || continue
+            cat "$f"; echo
+          done | sort -u | grep -v '^$' > "$all_files"
+
+          checked_out=0
+          while IFS= read -r file; do
+            [ -n "$file" ] || continue
+            tmp=$(mktemp)
+            if git show "HEAD:${file}" > "$tmp" 2>/dev/null; then
+              mkdir -p "$(dirname "$file")"
+              mv "$tmp" "$file"
+              checked_out=$((checked_out + 1))
+            else
+              rm -f "$tmp"
+              echo "::warning::Could not fetch $file from HEAD (not at HEAD — removed in PR?)"
+            fi
+          done < "$all_files"
+          rm -f "$all_files"
+          echo "Checked out ${checked_out} changed file(s)."
+
+      # ── PHP syntax lint ───────────────────────────────────────────
+
+      - name: PHP syntax lint
+        id: php-lint
+        if: always() && steps.gate.outputs.php_lint == 'true' && env.HAS_PHP == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_php.txt ] || [ ! -s /tmp/changed_php.txt ]; then
+            echo "No PHP files to check — skipping."
+            exit 0
+          fi
+          errors=0
+          while IFS= read -r file; do
+            [ -n "$file" ] || continue
+            if ! php -l "$file" 2>&1; then
+              errors=$((errors + 1))
+            fi
+          done < /tmp/changed_php.txt
+          if [ "$errors" -gt 0 ]; then
+            echo "::error::${errors} file(s) have PHP parse errors"
+            exit 1
+          fi
+          echo "All PHP files passed syntax check."
+
+      # ── PHPCS ─────────────────────────────────────────────────────
+
+      - name: Run PHPCS
+        id: phpcs
+        if: always() && steps.gate.outputs.phpcs == 'true' && env.HAS_PHP == 'true'
+        run: |
+          set -euo pipefail
+          EXCLUDE=$(python3 - <<'PY'
+          import os
+          sniff_dir = 'mcs/Magento2/Sniffs/Legacy'
+          exclude_names = {
+              'Layout', 'ObsoleteConfigNodes', 'ObsoleteSystemConfiguration',
+              'ObsoleteAcl', 'ObsoleteMenu', 'ClassReferencesInConfigurationFiles',
+              'ModuleXML', 'WidgetXML', 'RestrictedCode',
+          }
+          sniffs = sorted([
+              'Magento2.Legacy.' + name
+              for name in exclude_names
+              if os.path.exists(f'{sniff_dir}/{name}Sniff.php')
+          ])
+          print(','.join(sniffs))
+          PY
+          )
+          .github/scripts/run-phpcs.sh "PHP" /tmp/changed_php.txt "--exclude=$EXCLUDE"
+
+      - name: XML well-formedness lint
+        id: xml-lint
+        if: always() && steps.gate.outputs.xml_lint == 'true' && env.HAS_STATIC == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_xml.txt ] || [ ! -s /tmp/changed_xml.txt ]; then
+            echo "No XML/XSD files to check — skipping."
+            exit 0
+          fi
+          errors=0
+          while IFS= read -r file; do
+            [ -n "$file" ] || continue
+            if ! python3 -c "import sys,xml.etree.ElementTree as ET; ET.parse(sys.argv[1])" "$file" 2>&1; then
+              errors=$((errors + 1))
+            fi
+          done < /tmp/changed_xml.txt
+          if [ "$errors" -gt 0 ]; then
+            echo "::error::${errors} XML/XSD file(s) are not well-formed"
+            exit 1
+          fi
+          echo "All XML/XSD files are well-formed."
+
+      - name: Run PHPCS for XML/XSD
+        id: phpcs-xml
+        if: always() && steps.gate.outputs.phpcs_xml == 'true' && env.HAS_STATIC == 'true'
+        run: |
+          set -euo pipefail
+          grep -vE '^(\.github/|node_modules/|vendor/)' /tmp/changed_xml.txt 2>/dev/null > /tmp/changed_xml_phpcs.txt || true
+          python3 - <<'PY'
+          import xml.etree.ElementTree as ET, sys
+          src = 'mcs/Magento2/ruleset.xml'
+          try:
+              root = ET.parse(src).getroot()
+          except Exception as e:
+              print(f"Could not parse {src}: {e}", file=sys.stderr)
+              sys.exit(1)
+          rules = [r.get('ref') for r in root.findall('rule')
+                   if any(p.text and r'\.xml$' in p.text for p in r.findall('exclude-pattern'))]
+          lines = ['<?xml version="1.0"?>', '<ruleset name="Magento2-XML-XSD">', '    <rule ref="Magento2"/>']
+          for ref in rules:
+              lines += [f'    <rule ref="{ref}">', r'        <exclude-pattern>*\.xsd$</exclude-pattern>', '    </rule>']
+          lines.append('</ruleset>')
+          open('/tmp/phpcs-xml-ruleset.xml', 'w').write('\n'.join(lines))
+          print(f"Generated /tmp/phpcs-xml-ruleset.xml with XSD exclusions for: {', '.join(rules) or 'none'}")
+          PY
+          PHPCS_STANDARD=/tmp/phpcs-xml-ruleset.xml \
+          .github/scripts/run-phpcs.sh "XML/XSD" /tmp/changed_xml_phpcs.txt "--extensions=xml,xsd"
+
+      - name: Run PHPCS for HTML
+        id: phpcs-html
+        if: always() && steps.gate.outputs.phpcs_html == 'true' && env.HAS_STATIC == 'true'
+        run: |
+          set -euo pipefail
+          .github/scripts/run-phpcs.sh "HTML" /tmp/changed_html.txt
+
+      - name: Run PHPCS for GraphQL
+        id: phpcs-graphql
+        if: always() && steps.gate.outputs.phpcs_graphql == 'true' && env.HAS_STATIC == 'true'
+        run: |
+          set -euo pipefail
+          .github/scripts/run-phpcs.sh "GraphQL schema" /tmp/changed_graphqls.txt
+
+      - name: Run PHPCS for LESS
+        id: phpcs-less
+        if: always() && steps.gate.outputs.phpcs_less == 'true' && env.HAS_STATIC == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_less.txt ] || [ ! -s /tmp/changed_less.txt ]; then
+            echo "No LESS files to check — skipping PHPCS LESS."
+            exit 0
+          fi
+
+          # Filter against Jenkins LESS blacklist (legacy files with known violations)
+          bl="/tmp/magento2-static/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist"
+          {
+            cat "$bl/old.txt" 2>/dev/null || true
+            cat "$bl/ee.txt"  2>/dev/null || true
+          } > /tmp/less_blacklist.txt
+
+          filtered_less=$(mktemp)
+          python3 - /tmp/changed_less.txt /tmp/less_blacklist.txt "$filtered_less" <<'PYEOF'
+          import fnmatch, sys
+          with open(sys.argv[2]) as f:
+              patterns = [l.strip() for l in f if l.strip() and not l.strip().startswith('//')]
+          with open(sys.argv[1]) as f:
+              files = [l.strip() for l in f if l.strip()]
+          filtered = [fp for fp in files if not any(fnmatch.fnmatch(fp, p) for p in patterns)]
+          with open(sys.argv[3], 'w') as out:
+              out.write('\n'.join(filtered) + ('\n' if filtered else ''))
+          PYEOF
+
+          if [ ! -s "$filtered_less" ]; then
+            echo "All changed LESS files are blacklisted — skipping PHPCS LESS."
+            exit 0
+          fi
+
+          .github/scripts/run-phpcs.sh "LESS" "$filtered_less"
+
+      # ── PHPMD ────────────────────────────────────────────────────
+
+      - name: Run PHPMD
+        id: phpmd
+        if: always() && steps.gate.outputs.phpmd == 'true' && env.HAS_PHP == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_php.txt ] || [ ! -s /tmp/changed_php.txt ]; then
+            echo "No PHP files to check, skipping phpmd."
+            exit 0
+          fi
+          phpmd_bin="${GITHUB_WORKSPACE}/qa-tools/vendor/bin/phpmd"
+          prepend_file=$(mktemp)
+          if [ "${{ steps.fetch-static.outputs.ready }}" != "true" ]; then
+            ref="${{ steps.php-version.outputs.magento_composer_ref }}"
+            [ -z "$ref" ] && ref="2.4-develop"
+            echo "::warning::Magento static framework unavailable — fetching PHPMD ruleset directly from magento/magento2@${ref}."
+            magento_ruleset=$(mktemp /tmp/phpmd-ruleset-raw-XXXXXX.xml)
+            if ! curl -fsSL "https://raw.githubusercontent.com/magento/magento2/${ref}/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml" \
+                    -o "$magento_ruleset" 2>/dev/null; then
+              echo "::error::Failed to fetch PHPMD ruleset — skipping PHPMD."
+              exit 0
+            fi
+          else
+            magento_ruleset="/tmp/magento2-static/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml"
+            prepend_file="/tmp/magento2-static/phpmd-prepend.php"
+            cat > "$prepend_file" <<'PHP'
+          <?php
+          $root = '/tmp/magento2-static';
+          $traitFile = $root . '/lib/internal/Magento/Framework/GetParameterClassTrait.php';
+          if (is_file($traitFile)) {
+              require_once $traitFile;
+          }
+          spl_autoload_register(static function (string $class) use ($root): void {
+              if (strpos($class, 'Magento\\') !== 0) {
+                  return;
+              }
+              $relative = str_replace('\\', '/', $class) . '.php';
+              foreach ([$root . '/lib/internal/', $root . '/app/code/'] as $base) {
+                  $file = $base . $relative;
+                  if (is_file($file)) {
+                      require_once $file;
+                      return;
+                  }
+              }
+          });
+          PHP
+          fi
+          # Wrap the Magento ruleset to exclude rules that require the full
+          # vendor tree (Laminas etc.) and crash in the sparse-clone environment.
+          ruleset="/tmp/phpmd-ruleset-ci.xml"
+          {
+            printf '<?xml version="1.0" encoding="UTF-8"?>\n'
+            printf '<ruleset name="Magento PHPMD (CI)" xmlns="http://pmd.sf.net/ruleset/1.0.0"\n'
+            printf '         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n'
+            printf '         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">\n'
+            printf '  <description>Magento PHPMD rules, excluding rules that require the full vendor tree.</description>\n'
+            printf '  <rule ref="%s">\n' "$magento_ruleset"
+            printf '    <exclude name="CookieAndSessionMisuse"/>\n'
+            printf '    <exclude name="AllPurposeAction"/>\n'
+            printf '  </rule>\n'
+            printf '</ruleset>\n'
+          } > "$ruleset"
+
+          mapfile -t files < <(while IFS= read -r f; do [ -f "$f" ] && printf '%s\n' "$f"; done < /tmp/changed_php.txt)
+
+          # PHPMD 3.x: Symfony "analyze"; 2.x: legacy positional arguments.
+          phpmd_symfony=false
+          if $phpmd_bin list --raw 2>/dev/null | grep -qE '^analyze[[:space:]]'; then
+            phpmd_symfony=true
+          fi
+
+          phpmd_exit=0
+          phpmd_stderr=$(mktemp)
+          batch_size=20
+          for ((i=0; i<${#files[@]}; i+=batch_size)); do
+            batch_files=("${files[@]:i:batch_size}")
+            batch_list=$(printf "%s," "${batch_files[@]}" | sed 's/,*$//')
+            if [ "$phpmd_symfony" = true ]; then
+              timeout 120 php -d auto_prepend_file="$prepend_file" -d memory_limit=512M \
+                "$phpmd_bin" analyze "${batch_files[@]}" \
+                --format=text \
+                --ruleset="$ruleset" \
+                --suffixes=php --suffixes=phtml \
+                --no-progress 2>>"$phpmd_stderr" || phpmd_exit=$?
+            else
+              timeout 120 php -d auto_prepend_file="$prepend_file" -d memory_limit=512M \
+                "$phpmd_bin" \
+                "$batch_list" \
+                text \
+                "$ruleset" \
+                --suffixes=php,phtml 2>>"$phpmd_stderr" || phpmd_exit=$?
+            fi
+            [ "$phpmd_exit" -ne 0 ] && [ "$phpmd_exit" -ne 2 ] && break
+          done
+          # If PHPMD exited cleanly (no violations, exit 0) but produced stderr, it likely
+          # means pdepend failed to parse some files without signalling an error — silent
+          # coverage gap. PHPMD 3.x also writes GitHub annotation lines (::warning::) to
+          # stderr on top of the text violations on stdout; those are normal and appear only
+          # when violations are found (exit 2), so we only inspect stderr on exit 0.
+          if [ "$phpmd_exit" -eq 0 ] && [ -s "$phpmd_stderr" ]; then
+            echo "::warning::PHPMD produced error output — some files may not have been analysed (pdepend parse failure?):"
+            while IFS= read -r line; do echo "::warning::$line"; done < "$phpmd_stderr"
+          fi
+          rm -f "$phpmd_stderr"
+          if [ "$phpmd_exit" -eq 124 ]; then
+            echo "::error::PHPMD batch timed out (120 s). The PR may have too many complex files for a single batch. Consider splitting the PR."
+            exit 1
+          fi
+          if [ "$phpmd_exit" -eq 143 ]; then
+            echo "::error::PHPMD was terminated by SIGTERM (exit 143). Possible cause: OOM or job timeout on a large PR."
+            exit 1
+          fi
+          exit "$phpmd_exit"
+
+      # ── strict_types ──────────────────────────────────────────────
+
+      - name: Check strict_types declaration
+        id: strict-types
+        if: always() && steps.gate.outputs.strict_types == 'true' && env.HAS_PHP == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -s /tmp/new_php.txt ]; then
+            echo "No new PHP files to check."
+            exit 0
+          fi
+
+          missing=""
+          while IFS= read -r file; do
+            if [ -n "$file" ] && [ -f "$file" ]; then
+              if ! grep -q 'strict_types=1' "$file"; then
+                missing="$missing\n  $file"
+              fi
+            fi
+          done < /tmp/new_php.txt
+
+          if [ -n "$missing" ]; then
+            echo "::error::New PHP files missing declare(strict_types=1):"
+            echo -e "$missing"
+            exit 1
+          fi
+          echo "All new PHP files have strict_types declaration."
+
+      - name: Check fixture reuse (static parity)
+        id: fixture-reuse
+        if: always() && steps.gate.outputs.fixture_reuse == 'true' && env.HAS_PHP == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_php.txt ] || [ ! -s /tmp/changed_php.txt ]; then
+            echo "No PHP files to check, skipping fixture reuse."
+            exit 0
+          fi
+
+          bad_files=""
+          while IFS= read -r file; do
+            [ -n "$file" ] || continue
+            [ -f "$file" ] || continue
+            if ! echo "$file" | grep -qE '^dev/tests/integration/.*/(_files|Fixtures)/'; then
+              continue
+            fi
+            if grep -Pq '(?<![=\s*])\b(require|require_once|include)\b' "$file"; then
+              bad_files="${bad_files}\n${file}"
+            fi
+          done < /tmp/changed_php.txt
+
+          if [ -n "$bad_files" ]; then
+            echo "::error::The following fixture files incorrectly reuse fixtures:"
+            echo -e "$bad_files"
+            echo "Use Magento\\TestFramework\\Workaround\\Override\\Fixture\\Resolver::requireDataFixture"
+            exit 1
+          fi
+          echo "Fixture reuse check passed."
+
+      # ── Copyright headers ─────────────────────────────────────────
+
+      - name: Check copyright headers
+        id: copyright
+        if: always() && steps.install-mcs.outputs.ready == 'true' && env.HAS_COPYRIGHT_FILES == 'true'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/copyright_changed.txt ] || [ ! -s /tmp/copyright_changed.txt ]; then
+            echo "No copyright-eligible files — skipping."
+            exit 0
+          fi
+
+          # Pre-fetch base versions for copyright comparison.
+          # Primary: git ls-tree (tree objects from the earlier --filter=blob:none fetch) to
+          # get the blob SHA, then git cat-file to fetch the blob content via lazy partial-clone.
+          # Fallback: GitHub API for files whose subtree objects are missing from the local
+          # partial clone (known limitation with recently-added directories on shallow fetches).
+          mkdir -p /tmp/copyright_base
+          while IFS= read -r f; do
+            [ -z "$f" ] && continue
+            mkdir -p "/tmp/copyright_base/$(dirname "$f")" 2>/dev/null || continue
+            blob=$(git ls-tree "$base_sha" -- "$f" 2>/dev/null | awk 'NR==1{print $3}')
+            if [ -n "$blob" ]; then
+              git cat-file blob "$blob" > "/tmp/copyright_base/${f}" 2>/dev/null || true
+            else
+              # Tree object not in local partial clone (subtree may not have been fetched).
+              # Fetch base file content via GitHub API so the copyright check can run.
+              # For files that genuinely do not exist in base, the API returns 404 and the
+              # output file is empty — PHP treats that as "no base copyright" and skips.
+              gh api \
+                --header "Accept: application/vnd.github.raw" \
+                "repos/${{ github.repository }}/contents/${f}?ref=${base_sha}" \
+                > "/tmp/copyright_base/${f}" 2>/dev/null || true
+            fi
+          done < /tmp/copyright_changed.txt
+
+          added_flag=""
+          [ -f /tmp/copyright_added.txt ] && added_flag="--added /tmp/copyright_added.txt"
+
+          php .github/scripts/check_copyright_pr.php \
+            --files    /tmp/copyright_changed.txt \
+            $added_flag \
+            --base-dir /tmp/copyright_base \
+            --template "${GITHUB_WORKSPACE}/.github/scripts/copyright-template.txt"
+
+      # ── ESLint ────────────────────────────────────────────────────
+
+      - name: Run ESLint
+        id: eslint
+        if: always() && steps.gate.outputs.eslint == 'true' && env.HAS_JS == 'true'
+        run: |
+          set -euo pipefail
+          if [ ! -f /tmp/changed_js.txt ] || [ ! -s /tmp/changed_js.txt ]; then
+            echo "No JS files to check — skipping ESLint."
+            exit 0
+          fi
+
+          if [ "${{ steps.fetch-static.outputs.ready }}" != "true" ]; then
+            echo "::warning::Magento static framework unavailable — ESLint whitelist/blacklist filtering skipped. All changed JS files will be linted."
+          fi
+
+          # Apply Jenkins whitelist then blacklist — both live in CE repo sparse clone.
+          # Whitelist defines which files are expected to comply (app/code, app/design,
+          # lib/web/mage, etc.). Files outside it (grunt tasks, setup scripts) are not
+          # subject to ESLint in Jenkins and must be excluded here too.
+          jsd="/tmp/magento2-static/dev/tests/static/testsuite/Magento/Test/Js/_files"
+          {
+            cat "$jsd/whitelist/magento.txt" 2>/dev/null || true
+            cat "$jsd/whitelist/ee.txt"      2>/dev/null || true
+            cat "$jsd/whitelist/b2b.txt"     2>/dev/null || true
+          } > /tmp/eslint_whitelist.txt
+          {
+            cat "$jsd/blacklist/magento.txt" 2>/dev/null || true
+            cat "$jsd/blacklist/ee.txt"      2>/dev/null || true
+            cat "$jsd/blacklist/b2b.txt"     2>/dev/null || true
+          } > /tmp/eslint_blacklist.txt
+
+          mapfile -t js_args < <(python3 - /tmp/changed_js.txt /tmp/eslint_whitelist.txt /tmp/eslint_blacklist.txt <<'PYEOF'
+          import re, sys
+
+          def glob_to_regex(pattern):
+              result = ''
+              i = 0
+              while i < len(pattern):
+                  if pattern[i:i+3] == '**/':
+                      result += '(?:.+/)?'
+                      i += 3
+                  elif pattern[i:i+2] == '**':
+                      result += '.*'
+                      i += 2
+                  elif pattern[i] == '*':
+                      result += '[^/]*'
+                      i += 1
+                  elif pattern[i] == '?':
+                      result += '[^/]'
+                      i += 1
+                  else:
+                      result += re.escape(pattern[i])
+                      i += 1
+              return re.compile('^' + result + '$')
+
+          def load(path):
+              try:
+                  with open(path) as f:
+                      return [glob_to_regex(l.strip()) for l in f
+                              if l.strip() and not l.strip().startswith('#')
+                              and not l.strip().startswith('//')]
+              except FileNotFoundError:
+                  return []
+
+          # Known top-level dirs that are not root-level Magento modules.
+          NON_MODULE_DIRS = {
+              'app', 'lib', 'dev', 'pub', 'setup', 'vendor', '.github',
+              'bin', 'generated', 'var', 'build', 'node_modules',
+          }
+
+          def whitelist_path(fp):
+              # Root-level module repos use PascalCase top-level dirs instead
+              # of app/code/Magento/. Remap for whitelist matching only;
+              # pass the original path to ESLint.
+              first = fp.split('/')[0]
+              if first and first[0].isupper() and first not in NON_MODULE_DIRS:
+                  return 'app/code/Magento/' + fp
+              return fp
+
+          with open(sys.argv[1]) as f:
+              files = [l.strip() for l in f if l.strip()]
+          whitelist = load(sys.argv[2])
+          blacklist = load(sys.argv[3])
+
+          result = []
+          for fp in files:
+              match_fp = whitelist_path(fp)
+              if whitelist and not any(r.match(match_fp) for r in whitelist):
+                  continue
+              if any(r.match(match_fp) for r in blacklist):
+                  continue
+              result.append(fp)
+          print('\n'.join(result))
+          PYEOF
+          )
+
+          if [ ${#js_args[@]} -eq 0 ] || [ -z "${js_args[*]}" ]; then
+            echo "All changed JS files are outside whitelist scope or blacklisted — skipping ESLint."
+            exit 0
+          fi
+
+          mcs/node_modules/.bin/eslint \
+            -c mcs/eslint/eslint.config.mjs \
+            "${js_args[@]}"
+
+      - name: Coding standard results summary
+        if: always() && steps.install-mcs.outputs.ready == 'true'
+        run: |
+          {
+            echo "## Coding Standard Results"
+            echo "| Check | Status |"
+            echo "|-------|--------|"
+            echo "| PHP syntax lint | ${{ steps.php-lint.outcome      == 'success' && '✅' || steps.php-lint.outcome      == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPCS PHP       | ${{ steps.phpcs.outcome        == 'success' && '✅' || steps.phpcs.outcome        == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| XML lint        | ${{ steps.xml-lint.outcome     == 'success' && '✅' || steps.xml-lint.outcome     == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPCS XML/XSD   | ${{ steps.phpcs-xml.outcome    == 'success' && '✅' || steps.phpcs-xml.outcome    == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPCS HTML      | ${{ steps.phpcs-html.outcome   == 'success' && '✅' || steps.phpcs-html.outcome   == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPCS GraphQL   | ${{ steps.phpcs-graphql.outcome == 'success' && '✅' || steps.phpcs-graphql.outcome == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPCS LESS      | ${{ steps.phpcs-less.outcome   == 'success' && '✅' || steps.phpcs-less.outcome   == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| PHPMD           | ${{ steps.phpmd.outcome        == 'success' && '✅' || steps.phpmd.outcome        == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| Strict types    | ${{ steps.strict-types.outcome == 'success' && '✅' || steps.strict-types.outcome == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| Fixture reuse   | ${{ steps.fixture-reuse.outcome == 'success' && '✅' || steps.fixture-reuse.outcome == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| Copyright       | ${{ steps.copyright.outcome    == 'success' && '✅' || steps.copyright.outcome    == 'skipped' && '⏭️' || '❌' }} |"
+            echo "| ESLint          | ${{ steps.eslint.outcome       == 'success' && '✅' || steps.eslint.outcome       == 'skipped' && '⏭️' || '❌' }} |"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      # ── Linked PR aggregate gate ────────────────────────────────────
+
+      - name: Debug aggregate gate context
+        if: always() && contains(format(',{0},', vars.PR_QA_ENABLED_JOBS), ',aggregate-linked-pr-checks,')
+        run: |
+          set -euo pipefail
+          echo "PR_QA_ENABLED_JOBS='${{ vars.PR_QA_ENABLED_JOBS }}'"
+          if [ "${HAS_CROSS_REPO_TOKEN}" = "true" ]; then
+            echo "CROSS_REPO_READ_TOKEN=present"
+          else
+            echo "CROSS_REPO_READ_TOKEN=missing"
+          fi
+
+      - name: Skip if cross-repo token is missing
+        if: always() && contains(format(',{0},', vars.PR_QA_ENABLED_JOBS), ',aggregate-linked-pr-checks,') && env.HAS_CROSS_REPO_TOKEN == 'false'
+        run: |
+          set -euo pipefail
+          echo "CROSS_REPO_READ_TOKEN is not set. Skipping aggregate-linked-pr-checks."
+          exit 0
+
+      - name: Validate linked PR checks
+        if: always() && contains(format(',{0},', vars.PR_QA_ENABLED_JOBS), ',aggregate-linked-pr-checks,') && env.HAS_CROSS_REPO_TOKEN == 'true'
+        uses: actions/github-script@v9
+        with:
+          github-token: ${{ secrets.CROSS_REPO_READ_TOKEN }}
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const prNumber = context.payload.pull_request.number;
+            // Fetch the current PR body via REST API — the webhook payload snapshot
+            // (context.payload.pull_request.body) is frozen at trigger time and misses
+            // description edits made after the last push.
+            const { data: pr } = await github.rest.pulls.get({
+              owner, repo, pull_number: prNumber,
+            });
+            const body = pr.body || '';
+            // Only scan the "Related Pull Requests" section, up to the placeholder comment.
+            const sectionMatch = body.match(
+              /###\s*Related Pull Requests\s*\n([\s\S]*?)(?=<!-- related pull request placeholder -->|\n###|$)/i
+            );
+            const section = (sectionMatch ? sectionMatch[1] : '').replace(/<!--[\s\S]*?-->/g, '');
+
+            const linkRe = /https:\/\/github\.com\/([^/\s]+)\/([^/\s]+)\/pull\/(\d+)/g;
+            const seen = new Set();
+            const links = [];
+
+            for (const m of section.matchAll(linkRe)) {
+              const linkedOwner = m[1];
+              const linkedRepo = m[2];
+              const linkedPr = Number(m[3]);
+              const key = `${linkedOwner}/${linkedRepo}#${linkedPr}`;
+              if (seen.has(key)) continue;
+              seen.add(key);
+
+              if (linkedOwner === owner && linkedRepo === repo && linkedPr === prNumber) continue;
+              if (linkedOwner !== owner) {
+                core.notice(`Skipping ${key}: not in org ${owner}`);
+                continue;
+              }
+              links.push({ owner: linkedOwner, repo: linkedRepo, number: linkedPr });
+            }
+
+            if (links.length === 0) {
+              core.info('No linked PR URLs found in the Related Pull Requests section. Skipping aggregate gate.');
+              return;
+            }
+
+            const rows = [];
+            let hasFailures = false;
+
+            for (const link of links) {
+              const label = `${link.owner}/${link.repo}#${link.number}`;
+              const url   = `https://github.com/${link.owner}/${link.repo}/pull/${link.number}`;
+              try {
+                const { data: linked } = await github.rest.pulls.get({
+                  owner: link.owner,
+                  repo: link.repo,
+                  pull_number: link.number,
+                });
+
+                const sha = linked.head.sha;
+                const prState = linked.state;
+
+                // Only look at the pr-quality-gates check run; ignore unrelated checks (Kodiak, etc.)
+                const checksResp = await github.rest.checks.listForRef({
+                  owner: link.owner,
+                  repo: link.repo,
+                  ref: sha,
+                  check_name: 'pr-quality-gates',
+                  per_page: 100,
+                });
+                // GitHub returns most recent run first
+                const gateRun = (checksResp.data.check_runs || [])[0] || null;
+
+                let gateStatus = 'no run';
+                let failedSteps = [];
+                if (gateRun) {
+                  if (gateRun.status !== 'completed') {
+                    gateStatus = gateRun.status;
+                  } else {
+                    gateStatus = gateRun.conclusion;
+                    if (gateRun.conclusion === 'failure') {
+                      const jobIdMatch = (gateRun.details_url || gateRun.html_url || '').match(/\/job\/(\d+)/);
+                      if (jobIdMatch) {
+                        try {
+                          const { data: jobData } = await github.rest.actions.getJobForWorkflowRun({
+                            owner: link.owner,
+                            repo: link.repo,
+                            job_id: parseInt(jobIdMatch[1]),
+                          });
+                          failedSteps = (jobData.steps || [])
+                            .filter(s => s.conclusion === 'failure')
+                            .map(s => s.name);
+                        } catch (_) { /* step detail unavailable */ }
+                      }
+                    }
+                  }
+                }
+
+                // Only confirmed bad conclusions count as failures; in_progress/queued is not a failure
+                const badConclusions = new Set(['failure', 'cancelled', 'timed_out', 'action_required', 'stale']);
+                const isPending = !gateRun || gateRun.status !== 'completed';
+                const isFailed  = !isPending && badConclusions.has(gateRun.conclusion);
+
+                if (isFailed) hasFailures = true;
+
+                rows.push({
+                  pr: label,
+                  url,
+                  state: prState,
+                  gateStatus,
+                  failedSteps,
+                  result: isFailed ? 'FAIL' : isPending ? 'PENDING' : 'PASS',
+                  error: null,
+                });
+              } catch (e) {
+                const httpStatus = e.status || (e.response && e.response.status) || 0;
+                const isTransient = httpStatus >= 500 || httpStatus === 408 || httpStatus === 429;
+                const shortMsg = (e.message || String(e)).split('\n')[0].slice(0, 120);
+                if (!isTransient) hasFailures = true;
+                rows.push({
+                  pr: label,
+                  url,
+                  state: 'unknown',
+                  gateStatus: isTransient ? `api unavailable (${httpStatus})` : 'error',
+                  failedSteps: [],
+                  result: isTransient ? 'PENDING' : 'FAIL',
+                  error: isTransient ? null : shortMsg,
+                });
+              }
+            }
+
+            const ciCell = r => {
+              if (r.error) return `error: ${r.error}`;
+              if (r.gateStatus === 'no run') return 'no run yet';
+              if (r.gateStatus === 'success') return 'passing';
+              if (r.gateStatus === 'failure' && r.failedSteps.length > 0)
+                return r.failedSteps.join(', ');
+              return r.gateStatus;
+            };
+
+            // GitHub Actions summary: rendered as an HTML table
+            await core.summary
+              .addHeading('Linked PR Aggregate Report', 3)
+              .addTable([
+                ['Linked PR', 'State', 'Quality Gate', 'Result'].map(h => ({ data: h, header: true })),
+                ...rows.map(r => [
+                  `<a href="${r.url}">${r.pr}</a>`,
+                  r.state,
+                  ciCell(r),
+                  r.result === 'PASS' ? '✅ PASS' : r.result === 'PENDING' ? '⏳ PENDING' : '❌ FAIL',
+                ]),
+              ])
+              .write();
+
+            // Step log: plain text
+            const logLines = rows.map(r =>
+              `  ${r.result === 'PASS' ? '✅' : r.result === 'PENDING' ? '⏳' : '❌'} ${r.pr}  [${r.state}]  ${ciCell(r)}  ${r.url}`
+            );
+            const logReport = logLines.join('\n');
+
+            if (hasFailures) {
+              core.setFailed(`One or more linked PRs are not green:\n${logReport}`);
+            } else {
+              core.info(`All linked PRs are green:\n${logReport}`);
+            }
+
diff --git a/Inventory/Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml b/Inventory/Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml
index b23f6618c4ac..898a56e628bb 100644
--- a/Inventory/Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml
@@ -40,6 +40,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="createPreReqCategory1" stepKey="deletePreReqCategory1"/>
         </after>
diff --git a/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithDefaultSourceTest.xml b/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithDefaultSourceTest.xml
index 9213ec3ea0df..ffd7304ebe74 100644
--- a/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithDefaultSourceTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithDefaultSourceTest.xml
@@ -66,6 +66,9 @@
             </actionGroup>
             <deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
         <actionGroup ref="AdminGoToProductGridFilterResultsByInputEditProduct" stepKey="goToProductGridFilterResultsByInputEditProduct1">
diff --git a/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithTestSourceTest.xml b/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithTestSourceTest.xml
index 995ee9d4479e..ade71ade3a1e 100644
--- a/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithTestSourceTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithTestSourceTest.xml
@@ -42,6 +42,7 @@
             </actionGroup>
             <deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
         <actionGroup ref="AdminGoToProductGridFilterResultsByInputEditProduct" stepKey="goToProductGridFilterResultsByInputEditProduct1">
diff --git a/Inventory/Test/Mftf/Test/AdminCreateVirtualProductOnSingleStockModeTest.xml b/Inventory/Test/Mftf/Test/AdminCreateVirtualProductOnSingleStockModeTest.xml
index 6ca0af2936cc..4930fb77f34e 100644
--- a/Inventory/Test/Mftf/Test/AdminCreateVirtualProductOnSingleStockModeTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminCreateVirtualProductOnSingleStockModeTest.xml
@@ -32,6 +32,9 @@
         <after>
             <deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/Inventory/Test/Mftf/Test/AdminManageStockForVirtualProductIsDisabledTest.xml b/Inventory/Test/Mftf/Test/AdminManageStockForVirtualProductIsDisabledTest.xml
index e6809cb3cbc4..67e212857716 100644
--- a/Inventory/Test/Mftf/Test/AdminManageStockForVirtualProductIsDisabledTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminManageStockForVirtualProductIsDisabledTest.xml
@@ -69,6 +69,7 @@
             </actionGroup>
             <deleteData createDataKey="simpleVirtualMsiProduct1" stepKey="deleteVirtualProduct"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deletesimpleCategory1"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/Inventory/Test/Mftf/Test/AdminOutOfStockThresholdOnVirtualProductPageTest.xml b/Inventory/Test/Mftf/Test/AdminOutOfStockThresholdOnVirtualProductPageTest.xml
index 0e49100c13e9..e059207ef5ca 100644
--- a/Inventory/Test/Mftf/Test/AdminOutOfStockThresholdOnVirtualProductPageTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminOutOfStockThresholdOnVirtualProductPageTest.xml
@@ -28,6 +28,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
diff --git a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml
index 9fdefc32e07e..429a77334740 100644
--- a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml
@@ -46,6 +46,7 @@
             </actionGroup>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deletesimpleCategory1"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml
index c232c083a8d6..10988f2d7730 100644
--- a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml
+++ b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml
@@ -46,6 +46,7 @@
             </actionGroup>
             <deleteData createDataKey="simpleCategory1" stepKey="deletesimpleCategory1"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/Inventory/Test/Mftf/Test/SkippedTest/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml b/Inventory/Test/Mftf/Test/SkippedTest/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml
deleted file mode 100644
index 2eb8cde293a6..000000000000
--- a/Inventory/Test/Mftf/Test/SkippedTest/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright 2020 Adobe
- * All Rights Reserved.
- */
--->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest">
-        <annotations>
-            <skip>
-                <issueId value="MSI-1631"/>
-            </skip>
-            <group value="pr_exclude"/>
-        </annotations>
-    </test>
-</tests>
diff --git a/Inventory/Test/Mftf/Test/SkippedTest/EndToEndB2CGuestUserTest.xml b/Inventory/Test/Mftf/Test/SkippedTest/EndToEndB2CGuestUserTest.xml
deleted file mode 100644
index 7a67d5d09e78..000000000000
--- a/Inventory/Test/Mftf/Test/SkippedTest/EndToEndB2CGuestUserTest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright 2020 Adobe
- * All Rights Reserved.
- */
--->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="EndToEndB2CGuestUserTest">
-        <annotations>
-            <skip>
-                <issueId value="MSI-1631"/>
-            </skip>
-            <group value="pr_exclude"/>
-        </annotations>
-    </test>
-</tests>
diff --git a/Inventory/Test/Mftf/test-dependency-allowlist b/Inventory/Test/Mftf/test-dependency-allowlist
index 2837dd88a132..fce7cdb0b6cc 100644
--- a/Inventory/Test/Mftf/test-dependency-allowlist
+++ b/Inventory/Test/Mftf/test-dependency-allowlist
@@ -49,6 +49,7 @@ AdminProductEditPage
 StorefrontProductPage
 AdminAssignCategoryToProductAndSaveActionGroup
 DisableAllSourcesActionGroup
+AdminResetFilterInManageSourcesGridActionGroup
 StorefrontAssertProductNameOnProductPageActionGroup
 StorefrontAssertProductPriceOnProductPageActionGroup
 AdminProductSEOSection
@@ -67,3 +68,5 @@ CheckoutSuccessMainSection
 ClickPlaceOrderActionGroup
 CheckoutPaymentSection
 TurnOffManageStockConfig
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/Inventory/Test/Mftf/test-dependency-errors-detailed b/Inventory/Test/Mftf/test-dependency-errors-detailed
index 933208c8bca6..190cd5c25e5b 100644
--- a/Inventory/Test/Mftf/test-dependency-errors-detailed
+++ b/Inventory/Test/Mftf/test-dependency-errors-detailed
@@ -26,6 +26,7 @@ contains entity references that violate dependency constraints:
 	 CliIndexerReindexActionGroup from module(s): magento/module-indexer
 	 AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
 	 AssignWebsiteToStockActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminLogoutActionGroup from module(s): magento/module-backend
 	 AssertProductInStorefrontCategoryPage from module(s): magento/module-catalog
 	 AssertProductNameAndSkuInStorefrontProductPageActionGroup from module(s): magento/module-catalog
@@ -44,6 +45,7 @@ contains entity references that violate dependency constraints:
 	 AdminOrderDetailsPage from module(s): magento/module-gift-wrapping, magento/module-reward, magento/module-rma, magento/module-sales
 	 AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
 	 AssignWebsiteToStockActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminLogoutActionGroup from module(s): magento/module-backend
 	 AdminGoToProductGridFilterResultsByInputEditProduct from module(s): magento/module-inventory-admin-ui
 	 AdminOnProductEditPageAssignSourceToProduct from module(s): magento/module-inventory-admin-ui
@@ -128,6 +130,7 @@ contains entity references that violate dependency constraints:
 	 AdminGoToProductGridFilterResultsByInputEditProduct from module(s): magento/module-inventory-admin-ui
 	 AdminOnProductEditPageAssignSourceToProduct from module(s): magento/module-inventory-admin-ui
 	 AssignWebsiteToStockActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminLogoutActionGroup from module(s): magento/module-backend
 	 AssertProductInStorefrontCategoryPage from module(s): magento/module-catalog
 	 AssertProductInStorefrontProductPageActionGroup from module(s): magento/module-catalog
@@ -172,6 +175,7 @@ contains entity references that violate dependency constraints:
 	 CheckoutSuccessMainSection from module(s): magento/module-b2b, magento/module-checkout
 	 AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
 	 AssignWebsiteToStockActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminLogoutActionGroup from module(s): magento/module-backend
 	 AdminGoToProductGridFilterResultsByInputEditProduct from module(s): magento/module-inventory-admin-ui
 	 AdminOnProductEditPageAssignSourceToProduct from module(s): magento/module-inventory-admin-ui
@@ -199,6 +203,7 @@ contains entity references that violate dependency constraints:
 	 CheckoutSuccessMainSection from module(s): magento/module-b2b, magento/module-checkout
 	 AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
 	 AssignWebsiteToStockActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminLogoutActionGroup from module(s): magento/module-backend
 	 AdminGoToProductGridFilterResultsByInputEditProduct from module(s): magento/module-inventory-admin-ui
 	 AdminOnProductEditPageAssignSourceToProduct from module(s): magento/module-inventory-admin-ui
diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminCreateNewStockActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminCreateNewStockActionGroup.xml
index cd11c03e70a1..d0c210900739 100644
--- a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminCreateNewStockActionGroup.xml
+++ b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminCreateNewStockActionGroup.xml
@@ -22,11 +22,12 @@
         <selectOption selector="{{AdminEditStockGeneralSection.websites}}" userInput="{{websiteName}}" stepKey="selectWebsite" />
         <click selector="{{AdminEditStockGeneralSection.assignSources}}" stepKey="clickAssignSourceButton" />
         <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+        <waitForElementVisible selector="{{AdminEditStockSourcesSection.searchSourceText}}" stepKey="waitForAssignSourcesModalSearchField" />
         <conditionalClick selector="{{AdminEditStockSourcesSection.clearAll}}" dependentSelector="{{AdminEditStockSourcesSection.clearAll}}" visible="true" stepKey="clearAllPreviouslySearchedSources" />
         <fillField selector="{{AdminEditStockSourcesSection.searchSourceText}}" userInput="{{assignSource}}" stepKey="enterSourceName" />
         <click selector="{{AdminEditStockSourcesSection.clickSearchSource}}" stepKey="clickSearchSourceButton" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-        <checkOption selector="{{AdminEditStockSourcesSection.selectSource(assignSource)}}" stepKey="selectTheSource"/>
+        <click selector="{{AdminEditStockSourcesSection.selectSource(assignSource)}}" stepKey="selectTheSource"/>
         <click selector="{{AdminEditStockSourcesSection.doneButton}}" stepKey="clickDoneButton" />
         <click selector="{{AdminEditStockGeneralSection.saveAndContinueDropdown}}" stepKey="clickSaveAndContinueDropdown" />
         <click selector="{{AdminEditStockGeneralSection.saveAndCloseButton}}" stepKey="clickSaveAndClose" />
diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminDeleteStockActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminDeleteStockActionGroup.xml
index 51f0c1355fb4..3e72956149d9 100644
--- a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminDeleteStockActionGroup.xml
+++ b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminDeleteStockActionGroup.xml
@@ -16,7 +16,10 @@
             <argument name="websiteName" defaultValue="Main Website" type="string"/>
         </arguments>
         <amOnPage url="{{AdminStockPage.url}}" stepKey="navigateToManageStockPage"/>
+        <waitForPageLoad stepKey="waitForManageStockPageLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearKeywordFilters"/>
+        <waitForElementVisible selector="{{AdminManageStockGridBody.searchStockText}}" stepKey="waitForStockGridSearchField"/>
         <fillField selector="{{AdminManageStockGridBody.searchStockText}}" userInput="{{stockName}}" stepKey="enterStockName" />
         <click selector="{{AdminManageStockGridBody.clickSearchStock}}" stepKey="clickSearchStockButton" />
         <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
@@ -29,6 +32,7 @@
         <waitForPageLoad stepKey="waitForStoreGroupPageLoadPostEditingTheSources" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <seeElement selector="{{AdminManageStockGridBody.stockSavedSuccessfulMessage}}" stepKey="verifyTheStockSavedSuccessfully"/>
+        <waitForElementVisible selector="{{AdminManageStockGridBody.searchStockText}}" stepKey="waitForStockGridSearchFieldForDelete"/>
         <fillField selector="{{AdminManageStockGridBody.searchStockText}}" userInput="{{stockName}}" stepKey="enterStockNameForDelete" />
         <click selector="{{AdminManageStockGridBody.clickSearchStock}}" stepKey="clickSearchStockButtonForDelete" />
         <waitForPageLoad stepKey="waitForStoreGroupPageLoadForDelete" />
diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminManageStockGridClearFiltersActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminManageStockGridClearFiltersActionGroup.xml
new file mode 100644
index 000000000000..3ea5c4865c2e
--- /dev/null
+++ b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminManageStockGridClearFiltersActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminManageStockGridClearFiltersActionGroup">
+        <annotations>
+            <description>Opens the Admin Manage Stock grid and clicks Clear Filters when that control is visible.</description>
+        </annotations>
+        <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToManageStockGridPage"/>
+        <waitForPageLoad stepKey="waitForManageStockGridPageLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}"
+                          dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}"
+                          visible="true"
+                          stepKey="clickClearStockGridFiltersIfPresent"/>
+        <waitForLoadingMaskToDisappear stepKey="waitAfterClearStockGridFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminResetFilterInManageSourcesGridActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminResetFilterInManageSourcesGridActionGroup.xml
new file mode 100644
index 000000000000..6226228a7e55
--- /dev/null
+++ b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminResetFilterInManageSourcesGridActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminResetFilterInManageSourcesGridActionGroup">
+        <annotations>
+            <description>Navigates to the Admin Manage Sources grid and clears keyword search and column filters.</description>
+        </annotations>
+        <amOnPage url="{{AdminManageSourcePage.url}}" stepKey="amOnManageSourcesGridForFilterReset"/>
+        <waitForPageLoad stepKey="waitForManageSourcesGridForFilterReset"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}"
+                          dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true"
+                          stepKey="clearManageSourcesGridKeywordFilters"/>
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}"
+                          dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show"
+                          visible="true" stepKey="clearManageSourcesGridAppliedFilters"/>
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}"
+                          dependentSelector="{{AdminManageSourcesGridFilterControls.dropDown}}" visible="true"
+                          stepKey="clearManageSourcesGridFiltersDropdown"/>
+        <waitForPageLoad stepKey="waitForManageSourcesGridAfterFilterReset"/>
+    </actionGroup>
+</actionGroups>
diff --git a/InventoryAdminUi/Test/Mftf/Data/StockSourceLinksData.xml b/InventoryAdminUi/Test/Mftf/Data/StockSourceLinksData.xml
index fbada7868d43..a6300eb38d4b 100644
--- a/InventoryAdminUi/Test/Mftf/Data/StockSourceLinksData.xml
+++ b/InventoryAdminUi/Test/Mftf/Data/StockSourceLinksData.xml
@@ -16,4 +16,28 @@
         <var key="stock_id" entityKey="return" entityType="stock"/>
         <var key="source_code" entityKey="source[source_code]" entityType="source"/>
     </entity>
+    <entity name="SourceStockLinked2" type="source-stock-links">
+        <requiredEntity type="source-stock-link">Link2</requiredEntity>
+    </entity>
+    <entity name="Link2" type="source-stock-link">
+        <data key="priority">2</data>
+        <var key="stock_id" entityKey="return" entityType="stock"/>
+        <var key="source_code" entityKey="source[source_code]" entityType="source"/>
+    </entity>
+    <entity name="SourceStockLinked3" type="source-stock-links">
+        <requiredEntity type="source-stock-link">Link3</requiredEntity>
+    </entity>
+    <entity name="Link3" type="source-stock-link">
+        <data key="priority">3</data>
+        <var key="stock_id" entityKey="return" entityType="stock"/>
+        <var key="source_code" entityKey="source[source_code]" entityType="source"/>
+    </entity>
+    <entity name="SourceStockLinked4" type="source-stock-links">
+        <requiredEntity type="source-stock-link">Link4</requiredEntity>
+    </entity>
+    <entity name="Link4" type="source-stock-link">
+        <data key="priority">4</data>
+        <var key="stock_id" entityKey="return" entityType="stock"/>
+        <var key="source_code" entityKey="source[source_code]" entityType="source"/>
+    </entity>
 </entities>
diff --git a/InventoryAdminUi/Test/Mftf/Section/AdminManageStockFormSection/AdminEditStockSourcesSection.xml b/InventoryAdminUi/Test/Mftf/Section/AdminManageStockFormSection/AdminEditStockSourcesSection.xml
index c274d5260552..84cd39d1aa7b 100644
--- a/InventoryAdminUi/Test/Mftf/Section/AdminManageStockFormSection/AdminEditStockSourcesSection.xml
+++ b/InventoryAdminUi/Test/Mftf/Section/AdminManageStockFormSection/AdminEditStockSourcesSection.xml
@@ -14,11 +14,11 @@
         <element name="rowSourceName" type="text" selector=".data-row[data-repeat-index='{{arg1}}'] span[data-index='name']" parameterized="true"/>
         <element name="rowSourceDelete" type="button" selector=".data-row[data-repeat-index='{{arg1}}'] .action-delete" parameterized="true"/>
         <element name="tableRow" type="block" selector=".admin__dynamic-rows[data-index='assigned_sources'] tbody > tr.data-row"/>
-        <element name="clearAll" type="button" selector="//div[contains(@data-bind,'data.setToolbarNode')]//button[@class='action-tertiary action-clear']" />
-        <element name="searchSourceText" type="input" selector="//div[contains(@data-bind,'data.setToolbarNode')]//input[@placeholder='Search by keyword']"/>
-        <element name="clickSearchSource" type="button" selector="//div[contains(@data-bind,'data.setToolbarNode')]//div[@class='data-grid-search-control-wrap']//button[@class='action-submit']"/>
-        <element name="selectSource" type="select" selector="//tr[@class='data-row']//div[contains(text(),'{{test_source_code}}')]/../..//input[@class='admin__control-checkbox']" parameterized="true"/>
-        <element name="doneButton" type="button" selector="//button[@class='action-primary']//span[contains(text(),'Done')]" />
+        <element name="clearAll" type="button" selector=".inventory_stock_form_inventory_stock_form_sources_assign_sources_modal .admin__data-grid-header [data-action='grid-filter-reset']" />
+        <element name="searchSourceText" type="input" selector=".inventory_stock_form_inventory_stock_form_sources_assign_sources_modal .admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
+        <element name="clickSearchSource" type="button" selector=".inventory_stock_form_inventory_stock_form_sources_assign_sources_modal .data-grid-search-control-wrap > button.action-submit"/>
+        <element name="selectSource" type="select" selector="//input[ancestor::tr[contains(., '{{test_source_code}}')]]" parameterized="true"/>
+        <element name="doneButton" type="button" selector=".inventory_stock_form_inventory_stock_form_sources_assign_sources_modal button.action-primary" />
         <element name="deleteAssignedSources" type="button" selector="//tr[@class='data-row']//button[@class='action-delete']"/>
         <element name="deleteSpecificAssignedSources" type="button" selector="//tr[@class='data-row']//td//span[text()='{{var1}}']/../../../../..//button[@class='action-delete']" parameterized="true"/>
         <element name="deleteStock" type="button" selector="//div[@class='page-actions-buttons']//button[@data-ui-id='delete-button']"/>
diff --git a/InventoryAdminUi/Test/Mftf/Section/AdminManageStockGridSection/AdminManageStockGridBodySection.xml b/InventoryAdminUi/Test/Mftf/Section/AdminManageStockGridSection/AdminManageStockGridBodySection.xml
index 0b47f94a5679..8dffc1f4ff00 100644
--- a/InventoryAdminUi/Test/Mftf/Section/AdminManageStockGridSection/AdminManageStockGridBodySection.xml
+++ b/InventoryAdminUi/Test/Mftf/Section/AdminManageStockGridSection/AdminManageStockGridBodySection.xml
@@ -12,8 +12,8 @@
         <element name="stockSelectedCheckbox" type="checkbox" selector="#idscheck{{id}}" parameterized="true"/>
         <element name="assignedSourceContent" type="text" selector="table[data-role='grid'] ul[data-bind*='assignedSource']"/>
         <element name="tooltipAssignedSource" type="text" selector="//div[contains(@class, 'data-tooltip-title') and contains(text(), 'Assigned Sources:')]/..//span[text()='{{source_code}}']" parameterized="true"/>
-        <element name="searchStockText" type="input" selector="//input[@placeholder='Search by keyword'][1]"/>
-        <element name="clickSearchStock" type="button" selector="//div[@class='data-grid-search-control-wrap']//button[@class='action-submit']"/>
+        <element name="searchStockText" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
+        <element name="clickSearchStock" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .data-grid-search-control-wrap > button.action-submit"/>
         <element name="editStock" type="button" selector="//tr[@class='data-row']//div[contains(text(),'{{test_source_code}}')]/../..//a[@class='action-menu-item' and contains(text(),'Edit')]" parameterized="true"/>
         <element name="selectStock" type="select" selector="//tr[@class='data-row']//div[contains(text(),'{{test_stock_code}}')]/../..//input[@class='admin__control-checkbox']" parameterized="true"/>
         <element name="stockSavedSuccessfulMessage" type="text" selector="//div[@class='message message-success success']//div[contains(text(),'The Stock has been saved.')]"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
index 71be37c4427a..8817ec2ab0cb 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
@@ -39,6 +39,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="createPreReqCategory1" stepKey="deletePreReqCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminAddStockToVirtualProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminAddStockToVirtualProductTest.xml
index fcfdcd304481..fda2e287ef80 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminAddStockToVirtualProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminAddStockToVirtualProductTest.xml
@@ -38,6 +38,7 @@
             </actionGroup>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="createPreReqCategory1" stepKey="deletePreReqCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminAssignMultipleSourcesToStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminAssignMultipleSourcesToStockTest.xml
index 03cc1d2942b9..6f9428dbcd57 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminAssignMultipleSourcesToStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminAssignMultipleSourcesToStockTest.xml
@@ -45,6 +45,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminAssignSourcesSelectedOnTwoPagesToStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminAssignSourcesSelectedOnTwoPagesToStockTest.xml
index a3e70337bdce..6ba6b16ff4f3 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminAssignSourcesSelectedOnTwoPagesToStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminAssignSourcesSelectedOnTwoPagesToStockTest.xml
@@ -47,8 +47,9 @@
         </before>
         <after>
             <deleteData createDataKey="createStock" stepKey="deleteStock"/>
-            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnStockListPage"/>
-            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearSourceFilters"/>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminBackordersEnabledOnConfigurationPageAndAppliedToSimpleProductOnTestSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminBackordersEnabledOnConfigurationPageAndAppliedToSimpleProductOnTestSourceTest.xml
index 2747209d92c4..074e76820be5 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminBackordersEnabledOnConfigurationPageAndAppliedToSimpleProductOnTestSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminBackordersEnabledOnConfigurationPageAndAppliedToSimpleProductOnTestSourceTest.xml
@@ -106,7 +106,9 @@
             <waitForPageLoad time="30" stepKey="waitForDefaultStockPageLoaded"/>
             <selectOption selector="{{AdminEditStockSalesChannelsSection.websites}}" userInput="Main Website" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <click selector="{{AdminGridMainControls.saveAndContinue}}" stepKey="saveDefaultStock"/>
-
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnConfigurationPageCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnConfigurationPageCustomStockTest.xml
index fd6555facc42..518df2094bbd 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnConfigurationPageCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnConfigurationPageCustomStockTest.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
-            <skip>
-                <issueId value="https://github.com/magento/inventory/issues/1821"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
 
@@ -106,7 +103,7 @@
         <!--Verify product is not visible storefront.-->
         <amOnPage url="{{StorefrontCategoryPage.url($$category.custom_attributes[url_key]$$)}}" stepKey="navigateToCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <dontSee userInput="$bundleProduct.name$" stepKey="assertProductIsNotPresent"/>
+        <waitForText userInput="$bundleProduct.name$" stepKey="assertProductIsPresent1"/>
         <!--Disable "Manage Stock" in configuration.-->
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableManageStock"/>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -118,7 +115,7 @@
         <!--Verify product is visible storefront.-->
         <amOnPage url="{{StorefrontCategoryPage.url($$category.custom_attributes[url_key]$$)}}" stepKey="navigateToCategoryPageToVerifyBundleProduct"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoadToVerifyBundleProduct"/>
-        <see userInput="$bundleProduct.name$" stepKey="assertProductIsPresent"/>
+        <dontSee userInput="$bundleProduct.name$" stepKey="assertProductIsPresent"/>
         <see userInput="$$simpleProduct.price$$" stepKey="assertProductPriceIsPresent"/>
     </test>
 </tests>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnProductPageCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnProductPageCustomStockTest.xml
index 35634dd1682d..0d955fe77fd6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnProductPageCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminBundleProductDisabledManageStockOnProductPageCustomStockTest.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
-            <skip>
-                <issueId value="https://github.com/magento/inventory/issues/1821"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
 
@@ -92,7 +89,7 @@
         <!--Verify product is not visible storefront.-->
         <amOnPage url="{{StorefrontCategoryPage.url($$category.custom_attributes[url_key]$$)}}" stepKey="navigateToCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <dontSee userInput="$bundleProduct.name$" stepKey="assertProductIsNotPresent"/>
+        <dontSee userInput="$$bundleProduct.name$$" stepKey="assertProductIsNotPresent"/>
         <!--Disable "Manage Stock" On Product Page.-->
         <amOnPage url="{{AdminProductEditPage.url($$bundleProduct.id$$)}}" stepKey="openProductEditPageToSetStockStatus"/>
         <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
@@ -104,7 +101,7 @@
         <!--Verify product is visible storefront.-->
         <amOnPage url="{{StorefrontCategoryPage.url($$category.custom_attributes[url_key]$$)}}" stepKey="navigateToCategoryPageToVerifyBundleProduct"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoadToVerifyBundleProduct"/>
-        <see userInput="$bundleProduct.name$" stepKey="assertProductIsPresent"/>
+        <see userInput="$$bundleProduct.name$$" stepKey="assertProductIsPresent"/>
         <see userInput="$$simpleProduct.price$$" stepKey="assertProductPriceIsPresent"/>
     </test>
 </tests>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCanDeleteSourcesAssignedToStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCanDeleteSourcesAssignedToStockTest.xml
index c114bfdaf288..c7bfb46c4939 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCanDeleteSourcesAssignedToStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCanDeleteSourcesAssignedToStockTest.xml
@@ -29,6 +29,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderDownloadableProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderDownloadableProductCustomStockTest.xml
index 4305b35186b2..4f98f1298c5b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderDownloadableProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderDownloadableProductCustomStockTest.xml
@@ -25,6 +25,7 @@
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer" after="deleteCustomStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!-- Login as customer -->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithGroupedProductCustomStockTest.xml
index 2bfd47a761d6..69f3b16c476e 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithGroupedProductCustomStockTest.xml
@@ -38,6 +38,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Delete created test data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithVirtualProductDefaultSourceAfterPartialInvoiceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithVirtualProductDefaultSourceAfterPartialInvoiceTest.xml
index bb7abee91147..e6eec0a61e54 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithVirtualProductDefaultSourceAfterPartialInvoiceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderWithVirtualProductDefaultSourceAfterPartialInvoiceTest.xml
@@ -62,6 +62,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedCustomSource">
                 <argument name="sourceCode" value="$$customSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForConfigurableProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForConfigurableProductOnTestStockTest.xml
index 06616bf320b6..7dfa2d634caa 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForConfigurableProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForConfigurableProductOnTestStockTest.xml
@@ -40,6 +40,7 @@
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForVirtualProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForVirtualProductOnTestStockTest.xml
index 9111c5d917a1..8a2129e530cb 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForVirtualProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCatalogQuickSearchForVirtualProductOnTestStockTest.xml
@@ -42,6 +42,7 @@
             </actionGroup>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct"/>
             <deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml
index 5e9d6ff2b5b8..ff15ea767bac 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml
@@ -49,6 +49,7 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageCustomStockTest.xml
index aa47de2692cb..94d175b4ba1b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageCustomStockTest.xml
@@ -43,6 +43,7 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAfterFullInvoiceFullShipmentBundleProductCustomStockCustomWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAfterFullInvoiceFullShipmentBundleProductCustomStockCustomWebsiteTest.xml
index 357c6fac2f72..8eb1497f1e2c 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAfterFullInvoiceFullShipmentBundleProductCustomStockCustomWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAfterFullInvoiceFullShipmentBundleProductCustomStockCustomWebsiteTest.xml
@@ -113,6 +113,9 @@
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <!--Delete all customers via API-->
             <helper class="Magento\Customer\Test\Mftf\Helper\CustomerApiHelper" method="deleteAllCustomersApi" stepKey="deleteAllCustomersViaApi"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAutoReturnToStockVirtualProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAutoReturnToStockVirtualProductCustomStockTest.xml
index 57c4e2b35d57..177ff0f46671 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAutoReturnToStockVirtualProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAutoReturnToStockVirtualProductCustomStockTest.xml
@@ -55,6 +55,7 @@
             <comment userInput="BIC workaround" stepKey="revertAutoReturnItems" after="deleteProduct"/>
             <comment userInput="BIC workaround" stepKey="reindex" after="revertAutoReturnItems"/>
             <comment userInput="BIC workaround" stepKey="flushCache" after="reindex"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Assign virtual product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentGroupedProductCustomStockTest.xml
index ee88ae0f1cbb..74a2bf144a0f 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentGroupedProductCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters" after="clearOrdersFilters"/>
         </after>
 
         <!--Assign simple product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceVirtualProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceVirtualProductCustomStockTest.xml
index 6a790684c30f..6ba0d5d2d6cc 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceVirtualProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceVirtualProductCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Assign virtual product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundPartialInvoiceVirtualProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundPartialInvoiceVirtualProductCustomStockTest.xml
index a2096d7b1ebe..a34b3e555851 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundPartialInvoiceVirtualProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundPartialInvoiceVirtualProductCustomStockTest.xml
@@ -47,6 +47,7 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersFilters"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialReturnToStockAfterFullInvoiceFullShipmentSimpleProductsCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialReturnToStockAfterFullInvoiceFullShipmentSimpleProductsCustomStockTest.xml
index 1be33679ac78..bc2edd19a845 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialReturnToStockAfterFullInvoiceFullShipmentSimpleProductsCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialReturnToStockAfterFullInvoiceFullShipmentSimpleProductsCustomStockTest.xml
@@ -68,6 +68,8 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundBundleProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundBundleProductDefaultStockTest.xml
index 6a510d87f1bc..33935f436218 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundBundleProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundBundleProductDefaultStockTest.xml
@@ -32,6 +32,7 @@
         <after>
             <remove keyForRemoval="assignMainWebsiteToDefaultStock"/>
             <remove keyForRemoval="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Set 'Default' Source quantity.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceFullShipmentGroupedProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceFullShipmentGroupedProductDefaultStockTest.xml
index edfa75374cb8..5eb747b61ba1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceFullShipmentGroupedProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceFullShipmentGroupedProductDefaultStockTest.xml
@@ -41,6 +41,7 @@
             </actionGroup>
             <!--Clear Filters-->
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersFilters"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceGroupedProductCustomStockTest.xml
index ca646ba8a3d2..4c6d9928acc1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceGroupedProductCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Assign virtual product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoicePartialShipmentGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoicePartialShipmentGroupedProductCustomStockTest.xml
index b3c5a50166bb..67ae2deeeb7d 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoicePartialShipmentGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoicePartialShipmentGroupedProductCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters" after="clearOrdersFilters"/>
         </after>
 
         <!--Assign simple product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceVirtualProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceVirtualProductCustomStockTest.xml
index f3740f714075..4c82f6d99348 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceVirtualProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundFullInvoiceVirtualProductCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Assign virtual product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundSimpleProductNumericSkuTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundSimpleProductNumericSkuTest.xml
index b91b2beb7527..e4b0e3c3c868 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundSimpleProductNumericSkuTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundSimpleProductNumericSkuTest.xml
@@ -48,6 +48,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableSource">
                 <argument name="sourceCode" value="$source.source[source_code]$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundVirtualProductCustomOptionCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundVirtualProductCustomOptionCustomStockTest.xml
index daed3c5e145c..a773af65f9cc 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundVirtualProductCustomOptionCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoTotalRefundVirtualProductCustomOptionCustomStockTest.xml
@@ -35,6 +35,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" after="logoutOfAdmin" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
         </after>
 
         <!--Assign virtual product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateFullShipmentSimpleProductWithCustomOptionDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateFullShipmentSimpleProductWithCustomOptionDefaultStockTest.xml
index c213c50749cd..01070ef0b241 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateFullShipmentSimpleProductWithCustomOptionDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateFullShipmentSimpleProductWithCustomOptionDefaultStockTest.xml
@@ -45,6 +45,7 @@
             <!--Clear Filters-->
             <deleteData createDataKey="category" stepKey="deletecategory"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersFilters"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateInvoiceForVirtualProductInSingleStockModeTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateInvoiceForVirtualProductInSingleStockModeTest.xml
index 4aae6d687b6e..8bf3ba679170 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateInvoiceForVirtualProductInSingleStockModeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateInvoiceForVirtualProductInSingleStockModeTest.xml
@@ -29,6 +29,8 @@
         </before>
         <after>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductCustomStockTest.xml
index 7d5d12b48a45..9d277bb3e0d7 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductCustomStockTest.xml
@@ -29,6 +29,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
         </after>
 
         <!--Assign simple product to additional source.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductDefaultStockTest.xml
index 67256610166d..6f43d06b08e9 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateOrderWithGroupedProductDefaultStockTest.xml
@@ -52,6 +52,9 @@
             </actionGroup>
         </before>
         <after>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
 
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml
index ec1475a997f5..43c12e6d16a1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml
@@ -70,7 +70,9 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithConfigurableProductFromCustomSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithConfigurableProductFromCustomSourceTest.xml
index f02b76e9b3db..398d2ffc0c92 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithConfigurableProductFromCustomSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithConfigurableProductFromCustomSourceTest.xml
@@ -144,8 +144,17 @@
             <selectOption selector="{{AdminEditStockSalesChannelsSection.websites}}" userInput="Main Website"
                           stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <click selector="{{AdminGridMainControls.saveAndContinue}}" stepKey="saveDefaultStock"/>
+            <waitForPageLoad time="30" stepKey="waitAfterDefaultStockSave"/>
+
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad time="30" stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetInventoryStockListingToDefaultView"/>
             <!-- Delete configurable product created via UI -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminManageStockGridClearFiltersActionGroup" stepKey="clearManageStockGridFiltersAfter"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithSimpleProductFromCustomSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithSimpleProductFromCustomSourceTest.xml
index d4b162c960cf..1b64a326dec8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithSimpleProductFromCustomSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialShipmentForOrderWithSimpleProductFromCustomSourceTest.xml
@@ -80,12 +80,13 @@
             </actionGroup>
         </before>
         <after>
+            <!-- Delete all products via API -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <!-- Delete all products via API -->
-            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
         </after>
 
         <!-- Login as Customer and add Product to Cart-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateShipmentForWholeOrderWithSimpleProductFromCustomSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateShipmentForWholeOrderWithSimpleProductFromCustomSourceTest.xml
index c2f640de4780..f8beb58c4902 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateShipmentForWholeOrderWithSimpleProductFromCustomSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateShipmentForWholeOrderWithSimpleProductFromCustomSourceTest.xml
@@ -98,6 +98,9 @@
         <after>
             <!-- Delete simple product created via UI -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminManageStockGridClearFiltersActionGroup" stepKey="clearManageStockGridFiltersAfter"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminEachSourceQuantityCanBeSetTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminEachSourceQuantityCanBeSetTest.xml
index f385dfd71e72..6dd1c3579c52 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminEachSourceQuantityCanBeSetTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminEachSourceQuantityCanBeSetTest.xml
@@ -35,6 +35,7 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminInvoiceCreatedForWholeOrderWithGroupedProductWithChildsProductOnNonDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminInvoiceCreatedForWholeOrderWithGroupedProductWithChildsProductOnNonDefaultStockTest.xml
index 855687331df1..b24c408615e6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminInvoiceCreatedForWholeOrderWithGroupedProductWithChildsProductOnNonDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminInvoiceCreatedForWholeOrderWithGroupedProductWithChildsProductOnNonDefaultStockTest.xml
@@ -44,6 +44,8 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedCustomSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminMSICreditMemoReturnToStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminMSICreditMemoReturnToStockTest.xml
index d6f7df1e3394..b9fcd577c6d1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminMSICreditMemoReturnToStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminMSICreditMemoReturnToStockTest.xml
@@ -41,6 +41,9 @@
             <deleteData createDataKey="createMSISimpleProduct1" stepKey="deleteProduct"/>
             <deleteData createDataKey="createMSISimpleProduct2" stepKey="deleteProduct2"/>
             <!--Admin Logout-->
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!--  Step 1: Create New Category -->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageSourceGridColumnsSortingTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageSourceGridColumnsSortingTest.xml
index 4ccb205c1624..0aaba97a33b8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageSourceGridColumnsSortingTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageSourceGridColumnsSortingTest.xml
@@ -68,7 +68,7 @@
             <waitForPageLoad time="30" stepKey="waitForSourceEditPageLoadToDisableCustomSource4"/>
             <click selector="{{AdminEditSourceGeneralSection.isEnabledLabel}}" stepKey="clickIsEnabledToDisableCustomSource4"/>
             <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseCustomSourceToDisableCustomSource4"/>
-
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
index dda3a77485ea..9d6be17ec674 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
@@ -56,6 +56,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$additionalSource.source[source_code]$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForSimpleProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForSimpleProductTest.xml
index d9dbb62f90ee..68427ece0ca3 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForSimpleProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForSimpleProductTest.xml
@@ -71,6 +71,9 @@
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
                 <argument name="tags" value="full_page"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnProductPageTurnedOffForDownloadableProductInTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnProductPageTurnedOffForDownloadableProductInTest.xml
index 7307fad954e3..6a767f9cf27a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnProductPageTurnedOffForDownloadableProductInTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnProductPageTurnedOffForDownloadableProductInTest.xml
@@ -51,6 +51,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManualSelectingOfSourcesToDeductItemsInShipmentForOrderWithSimpleProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManualSelectingOfSourcesToDeductItemsInShipmentForOrderWithSimpleProductTest.xml
index cfa0eed59c29..308efdf5c68e 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManualSelectingOfSourcesToDeductItemsInShipmentForOrderWithSimpleProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManualSelectingOfSourcesToDeductItemsInShipmentForOrderWithSimpleProductTest.xml
@@ -100,6 +100,9 @@
         <after>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminManageStockGridClearFiltersActionGroup" stepKey="clearManageStockGridFiltersAfter"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForDifferentTypeOfProductsWithOutOfStockStatusOnSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForDifferentTypeOfProductsWithOutOfStockStatusOnSourceTest.xml
index c5252d70f448..260504e64441 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForDifferentTypeOfProductsWithOutOfStockStatusOnSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForDifferentTypeOfProductsWithOutOfStockStatusOnSourceTest.xml
@@ -114,12 +114,16 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableFirstCreatedSource">
                 <argument name="sourceCode" value="$$createSource.source[source_code]$$"/>
             </actionGroup>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
             <deleteData createDataKey="createStock" stepKey="deleteCreatedStock"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad time="30" stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetInventoryStockListingToDefaultView"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
 
         <comment userInput="Set to all products status 'Out of stock' on default source." stepKey="setOutOfStockToAllProductsComment"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForSimpleProductsWithOutOfStockStatusOnSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForSimpleProductsWithOutOfStockStatusOnSourceTest.xml
index 3e5e46288c38..0e8a59e09876 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForSimpleProductsWithOutOfStockStatusOnSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminMassActionTransferInventoryToSourceForSimpleProductsWithOutOfStockStatusOnSourceTest.xml
@@ -89,6 +89,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableFirstCreatedSource">
                 <argument name="sourceCode" value="$$createSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
             <deleteData createDataKey="createStock" stepKey="deleteCreatedStock"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminNotifyQuantityUseDefaultAppliedToSimpleProductOnConfigurationAdminPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminNotifyQuantityUseDefaultAppliedToSimpleProductOnConfigurationAdminPageTest.xml
index d3a8bf2b6c0b..1113b96ec8d7 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminNotifyQuantityUseDefaultAppliedToSimpleProductOnConfigurationAdminPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminNotifyQuantityUseDefaultAppliedToSimpleProductOnConfigurationAdminPageTest.xml
@@ -76,7 +76,9 @@
 
             <comment userInput="Set 'Notify for Quantity Below' to '1' by default" stepKey="revertNotifyQtyBelowComment"/>
             <magentoCLI command="config:set cataloginventory/item_options/notify_stock_qty 1" stepKey="setNotifyForQuantityBelowToOne"/>
-
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminArea"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml
index e37fb450d138..a2b4c0841d39 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml
@@ -56,6 +56,7 @@
             <amOnPage url="{{AdminManageStockPage.url}}" stepKey="navigateToStockIndexPage"/>
             <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="resetStocksGridFilter"/>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
index 27b4eafec125..5654a62e0a7b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
@@ -59,6 +59,7 @@
             </actionGroup>
             <!-- Delete all products via API -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithTextAttributeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
index ff2ae913b6b6..fc1b6de91d22 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedForGuestCustomerWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
@@ -45,6 +45,7 @@
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomerFromGrid">
                 <argument name="customerEmail" value="MsiCustomer1.email"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
index 7196cec9052a..3c5082d44105 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
@@ -54,7 +54,7 @@
             </actionGroup>
             <!-- Delete all products via API -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
-
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithTextAttributeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
index 058082c2c8e7..80113e5996da 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderCreatedWithConfigurableProductWithTextAttributeViaTheAdminTest.xml
@@ -54,7 +54,7 @@
             </actionGroup>
             <!-- Delete all products via API -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
-
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOrderWithSimpleProductOnDefaultStockCanceledFromAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOrderWithSimpleProductOnDefaultStockCanceledFromAdminTest.xml
index 328584111031..3bba0e45acaa 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOrderWithSimpleProductOnDefaultStockCanceledFromAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOrderWithSimpleProductOnDefaultStockCanceledFromAdminTest.xml
@@ -57,6 +57,9 @@
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="additionalStock" stepKey="deleteCustomStock"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminOutOfStockThresholdAppliedToDownloadableProductInAdvancedInventoryOnProductPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminOutOfStockThresholdAppliedToDownloadableProductInAdvancedInventoryOnProductPageTest.xml
index 5a866f27cfe5..54aab1fbd398 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminOutOfStockThresholdAppliedToDownloadableProductInAdvancedInventoryOnProductPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminOutOfStockThresholdAppliedToDownloadableProductInAdvancedInventoryOnProductPageTest.xml
@@ -48,6 +48,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageSourcesGridTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageSourcesGridTest.xml
index 537c30469c43..bdd2c7e86e4c 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageSourcesGridTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageSourcesGridTest.xml
@@ -47,6 +47,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageStocksGridTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageStocksGridTest.xml
index a22a83429336..5adac42b7cf4 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageStocksGridTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminPaginationWorkedInManageStocksGridTest.xml
@@ -46,6 +46,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminPriorityOfSourcesChangedByDragAndDropTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminPriorityOfSourcesChangedByDragAndDropTest.xml
index 6bbc8ff5b127..91d8b2209951 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminPriorityOfSourcesChangedByDragAndDropTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminPriorityOfSourcesChangedByDragAndDropTest.xml
@@ -28,6 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminRemoveSourcesAssignedToProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminRemoveSourcesAssignedToProductTest.xml
index 100029329db3..1dbcdcc057d6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminRemoveSourcesAssignedToProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminRemoveSourcesAssignedToProductTest.xml
@@ -31,6 +31,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductCustomStockCustomWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductCustomStockCustomWebsiteTest.xml
index b46b0ebbd458..cfdb04e91525 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductCustomStockCustomWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductCustomStockCustomWebsiteTest.xml
@@ -113,6 +113,9 @@
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <!--Delete all customers via API-->
             <helper class="Magento\Customer\Test\Mftf\Helper\CustomerApiHelper" method="deleteAllCustomersApi" stepKey="deleteAllCustomersViaApi"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductOnCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductOnCustomStockTest.xml
index 389e31bac384..f064f8001fe8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductOnCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminReorderBundleProductOnCustomStockTest.xml
@@ -84,6 +84,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminReorderSimpleProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminReorderSimpleProductDefaultStockTest.xml
index 5e6f6d1ba216..8c34068ff80b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminReorderSimpleProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminReorderSimpleProductDefaultStockTest.xml
@@ -42,6 +42,7 @@
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml
index 464eff76ea17..b81711ad9727 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml
@@ -41,7 +41,7 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <!-- Delete all products via API -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
-
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
         <comment userInput="Create Configurable product with two options 'In Stock' on 'Default' stock"
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSourceForEachQuantityCanBeSetByAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSourceForEachQuantityCanBeSetByAdminTest.xml
index e9e52e3fbf45..288ac007e3ab 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSourceForEachQuantityCanBeSetByAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSourceForEachQuantityCanBeSetByAdminTest.xml
@@ -31,6 +31,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSourcePrioritySelectionAlgorithmSimpleProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSourcePrioritySelectionAlgorithmSimpleProductCustomStockTest.xml
index 2b9d9931cfe3..9092862a5003 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSourcePrioritySelectionAlgorithmSimpleProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSourcePrioritySelectionAlgorithmSimpleProductCustomStockTest.xml
@@ -100,6 +100,7 @@
             <waitForPageLoad time="30" stepKey="waitFroDefaultStockEditPageLoad"/>
             <selectOption selector="{{AdminEditStockSalesChannelsSection.websites}}" userInput="Main Website" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <click selector="{{AdminGridMainControls.saveAndContinue}}" stepKey="saveDefaultStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
 
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml
index edddf989cbd5..d0634c1faca1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleMsiProductTest.xml
@@ -33,36 +33,25 @@
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
 
             <createData entity="SourceStockLinked1" stepKey="linkSourceStock1">
+                <requiredEntity createDataKey="createStock1"/>
+                <requiredEntity createDataKey="createSource4"/>
+            </createData>
+            <createData entity="SourceStockLinked2" stepKey="linkSourceStock2">
                 <requiredEntity createDataKey="createStock1"/>
                 <requiredEntity createDataKey="createSource1"/>
             </createData>
-            <createData entity="SourceStockLinked1" stepKey="linkSourceStock2">
+            <createData entity="SourceStockLinked3" stepKey="linkSourceStock3">
                 <requiredEntity createDataKey="createStock1"/>
                 <requiredEntity createDataKey="createSource2"/>
             </createData>
-            <createData entity="SourceStockLinked1" stepKey="linkSourceStock3">
+            <createData entity="SourceStockLinked4" stepKey="linkSourceStock4">
                 <requiredEntity createDataKey="createStock1"/>
                 <requiredEntity createDataKey="createSource3"/>
             </createData>
-            <createData entity="SourceStockLinked1" stepKey="linkSourceStock4">
-                <requiredEntity createDataKey="createStock1"/>
-                <requiredEntity createDataKey="createSource4"/>
-            </createData>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <waitForPageLoad stepKey="waitForPageLoadAfterLogin"/>
 
-            <actionGroup ref="AdminGoToStockGridFilterResultsByInputEditStock" stepKey="goToStockGridFilterResultsByInputEditStock1">
-                <argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
-                <argument name="filter_value" value="$$createStock1.stock[name]$$"/>
-            </actionGroup>
-
-            <dragAndDrop selector1="{{AdminEditStockSourcesSection.rowSourceDrag('3')}}" selector2="{{AdminEditStockSourcesSection.rowSourceDrag('1')}}" stepKey="dragAndDropNameSource4ToSecondPriority"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <dragAndDrop selector1="{{AdminEditStockSourcesSection.rowSourceDrag('0')}}" selector2="{{AdminEditStockSourcesSection.rowSourceDrag('1')}}" stepKey="dragAndDropNameSource4ToHighestPriority"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <click selector="{{AdminGridMainControls.saveAndContinue}}" stepKey="saveCustomStock"/>
-
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductGrid"/>
             <waitForPageLoad time="30" stepKey="waitForProductGridPageLoad"/>
         </before>
@@ -106,11 +95,11 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$simpleCategory1.name$$]" requiredAction="true" stepKey="searchAndSelectCategory1"/>
 
-        <fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="{{SimpleMsiProduct.quantity}}" stepKey="fillCustomSource1QtyField"/>
-        <fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="{{SimpleMsiProduct.quantity}}" stepKey="fillCustomSource2QtyField"/>
-        <fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="{{SimpleMsiProduct.quantity}}" stepKey="fillCustomSource3QtyField"/>
-        <fillField selector="{{AdminProductSourcesGrid.rowQty('3')}}" userInput="{{SimpleMsiProduct.quantity}}" stepKey="fillCustomSource4QtyField"/>
-        <fillField selector="{{AdminProductSourcesGrid.rowQty('4')}}" userInput="{{SimpleMsiProduct.quantity}}" stepKey="fillCustomSource5QtyField"/>
+        <fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="1000" stepKey="fillCustomSource1QtyField"/>
+        <fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="1000" stepKey="fillCustomSource2QtyField"/>
+        <fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="1000" stepKey="fillCustomSource3QtyField"/>
+        <fillField selector="{{AdminProductSourcesGrid.rowQty('3')}}" userInput="1000" stepKey="fillCustomSource4QtyField"/>
+        <fillField selector="{{AdminProductSourcesGrid.rowQty('4')}}" userInput="1000" stepKey="fillCustomSource5QtyField"/>
 
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseSimpleMsiProduct"/>
         <waitForPageLoad stepKey="waitForSimpleMsiProductGidPageLoad"/>
@@ -125,7 +114,9 @@
         <see selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" userInput="{{SimpleMsiProduct.price}}"  stepKey="seeSimpleMsiProductPriceInFirstRow"/>
         <see selector="{{AdminProductGridSection.productGridCell('1', 'Status')}}" userInput="Enabled" stepKey="seeSimpleMsiProductStatusInFirstRow"/>
         <see selector="{{AdminProductGridSection.productGridCell('1', 'Websites')}}" userInput="Main Website" stepKey="seeSimpleMsiProductWebsiteInFirstRow"/>
-
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <comment userInput="Login as Customer and add Product to Cart" stepKey="loginCustomerComment"/>
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
             <argument name="Customer" value="$$createCustomer$$"/>
@@ -179,13 +170,14 @@
         <click selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="createShipment"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
 
-        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
+        <waitForText selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
 
-        <actionGroup ref="SeeProductInShipmentItemsActionGroup" stepKey="checkProductInShipment">
-            <argument name="product" value="SimpleMsiProduct"/>
-        </actionGroup>
+        <scrollTo selector="{{AdminShipmentItemsSection.skuColumn}}" stepKey="scrollToShipmentItemsTable"/>
+        <waitForElementVisible selector="{{AdminShipmentItemsSection.skuColumn}}" time="30" stepKey="waitForShipmentItemsVisible"/>
+        <wait time="60" stepKey="waitForSku"/>
+        <see selector=".order-shipment-table .col-product" userInput="$$simpleMsiProduct1.product[name]$$" stepKey="checkProductInShipment"/>
 
-        <see selector="{{AdminShipmentInventorySection.sourceList}}" userInput="$$createSource4.source[name]$$" stepKey="checkSourceNameOnShipmentPage"/>
+        <waitForText selector="{{AdminShipmentInventorySection.sourceList}}" userInput="$$createSource4.source[name]$$" stepKey="checkSourceNameOnShipmentPage"/>
 
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleProductOutOfStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleProductOutOfStockTest.xml
index daaf676363f9..0054629a8456 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleProductOutOfStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminSourceSelectionAlgorithmSourcePriorityWithSimpleProductOutOfStockTest.xml
@@ -93,6 +93,7 @@
             <comment userInput="BIC workaround" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <comment userInput="BIC workaround" stepKey="saveDefaultStock"/>
 
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminStockCanBeDeletedFromEditStockPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminStockCanBeDeletedFromEditStockPageTest.xml
index d99fbcf3cab2..8954c5244128 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminStockCanBeDeletedFromEditStockPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminStockCanBeDeletedFromEditStockPageTest.xml
@@ -24,6 +24,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminStockCannotBeDeletedWhenSalesChannelIsAssignedTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminStockCannotBeDeletedWhenSalesChannelIsAssignedTest.xml
index 63bb7f2afd13..6340a23ceb4c 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminStockCannotBeDeletedWhenSalesChannelIsAssignedTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminStockCannotBeDeletedWhenSalesChannelIsAssignedTest.xml
@@ -30,6 +30,10 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetInventoryStockListingToDefaultView"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminStockDeletedFromGridWhenNoSalesChannelsAssignedTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminStockDeletedFromGridWhenNoSalesChannelsAssignedTest.xml
index 3f4235971fd9..5cf5fafd7bd8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminStockDeletedFromGridWhenNoSalesChannelsAssignedTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminStockDeletedFromGridWhenNoSalesChannelsAssignedTest.xml
@@ -25,6 +25,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminStockStatusChangedForMixedProductTypesOnTestSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminStockStatusChangedForMixedProductTypesOnTestSourceTest.xml
index 3778b72f4b6e..c2f077f34309 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminStockStatusChangedForMixedProductTypesOnTestSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminStockStatusChangedForMixedProductTypesOnTestSourceTest.xml
@@ -84,6 +84,7 @@
             <!--Disable all sources.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="deleteSource"/>
             <!--Admin logout-->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
         <!-- Login as customer -->
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSimpleProductQuantityInSingleStockModeViaTheAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSimpleProductQuantityInSingleStockModeViaTheAdminTest.xml
index b78676bf2963..178861cd0ba2 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSimpleProductQuantityInSingleStockModeViaTheAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSimpleProductQuantityInSingleStockModeViaTheAdminTest.xml
@@ -31,6 +31,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSourceDataTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSourceDataTest.xml
index 4cefdde84e11..6bf3385d1689 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSourceDataTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUpdateSourceDataTest.xml
@@ -25,6 +25,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftThresholdForSimpleProductOnTestSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftThresholdForSimpleProductOnTestSourceTest.xml
index 66ca1fba38b4..6b658fef5640 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftThresholdForSimpleProductOnTestSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftThresholdForSimpleProductOnTestSourceTest.xml
@@ -104,7 +104,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedSource">
                 <argument name="sourceCode" value="$$createSource.source[source_code]$$"/>
             </actionGroup>
-
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftTreshholdForSimpleProductOnTestSourceInCombinationWithNegativeOutOfStockThresholdAndBackordersTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftTreshholdForSimpleProductOnTestSourceInCombinationWithNegativeOutOfStockThresholdAndBackordersTest.xml
index 40062a34a301..50bf00799029 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftTreshholdForSimpleProductOnTestSourceInCombinationWithNegativeOutOfStockThresholdAndBackordersTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyOnlyXLeftTreshholdForSimpleProductOnTestSourceInCombinationWithNegativeOutOfStockThresholdAndBackordersTest.xml
@@ -49,6 +49,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <comment userInput="BIC workaround" stepKey="displayOutOfStockNo"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyToSeveralSimpleProductsMassActionUnAssignProductSourcesOnProductsGridToUnAssignAllAssignedSourcesTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyToSeveralSimpleProductsMassActionUnAssignProductSourcesOnProductsGridToUnAssignAllAssignedSourcesTest.xml
index 1a50a23c4ffd..8e364e65a929 100755
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyToSeveralSimpleProductsMassActionUnAssignProductSourcesOnProductsGridToUnAssignAllAssignedSourcesTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserApplyToSeveralSimpleProductsMassActionUnAssignProductSourcesOnProductsGridToUnAssignAllAssignedSourcesTest.xml
@@ -31,6 +31,7 @@
             <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
             <deleteData createDataKey="createStock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest.xml
index 33200a0f9ed8..1ec3b0c769b5 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest.xml
@@ -81,6 +81,10 @@
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
         <!-- Assign product to custom website -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductGrid"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromTestWebsiteWithSimpleProductWithInventoryOnDefaultAndTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromTestWebsiteWithSimpleProductWithInventoryOnDefaultAndTestStockTest.xml
index 82390a340e17..a2c60b96df3f 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromTestWebsiteWithSimpleProductWithInventoryOnDefaultAndTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromTestWebsiteWithSimpleProductWithInventoryOnDefaultAndTestStockTest.xml
@@ -88,6 +88,10 @@
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct1">
             <argument name="productId" value="$createProduct1.id$"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
index 36862854c091..e6becdac1ec5 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
@@ -85,6 +85,9 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedInvoiceForWholeOrderWithVirtualProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedInvoiceForWholeOrderWithVirtualProductOnTestStockTest.xml
index 218f45fdfa54..08e78675fbc5 100755
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedInvoiceForWholeOrderWithVirtualProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedInvoiceForWholeOrderWithVirtualProductOnTestStockTest.xml
@@ -39,6 +39,9 @@
             <deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <magentoCLI command="config:set {{DisableCashOnDeliveryPaymentMethod.path}} {{DisableCashOnDeliveryPaymentMethod.value}}" stepKey="disableCashOnDeliveryPaymentMethod"/>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedShipmentForWholeOrderWithSimpleProductFromTestSourceWithNumericSourceCodeTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedShipmentForWholeOrderWithSimpleProductFromTestSourceWithNumericSourceCodeTest.xml
index 6e92f6b7f382..79c18a0ab256 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedShipmentForWholeOrderWithSimpleProductFromTestSourceWithNumericSourceCodeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserCreatedShipmentForWholeOrderWithSimpleProductFromTestSourceWithNumericSourceCodeTest.xml
@@ -52,6 +52,7 @@
         </before>
         <after>
             <!--Assign Default Stock to Default Website.-->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminUserSetStatusForEachSourceItemTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminUserSetStatusForEachSourceItemTest.xml
index 31aae213438d..1e1bad549745 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminUserSetStatusForEachSourceItemTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminUserSetStatusForEachSourceItemTest.xml
@@ -56,6 +56,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
@@ -120,8 +121,8 @@
         <waitForText  selector="{{AdminProductGridSection.productGridCell('1', 'Websites')}}" userInput="Main Website" stepKey="seeSimpleProductWebsiteInFirstRow"/>
         <waitForElementClickable selector="{{AdminGridColumnsControls.cancel}}" stepKey="waitForCancelToHideColumnsBlock"/>
         <click selector="{{AdminGridColumnsControls.cancel}}" stepKey="clickOnCancelToHideColumnsBlock"/>
-        <waitForElementClickable selector="{{AdminGridRow.editByValue(SimpleMsiProduct.sku)}}" stepKey="waitForEditSimpleMsiProduct"/>
-        <click selector="{{AdminGridRow.editByValue(SimpleMsiProduct.sku)}}" stepKey="clickOnEditSimpleMsiProduct"/>
+        <waitForElementClickable selector="{{AdminProductGridSection.productGridNameProduct(SimpleMsiProduct.name)}}" stepKey="waitForEditSimpleMsiProduct"/>
+        <click selector="{{AdminProductGridSection.productGridNameProduct(SimpleMsiProduct.name)}}" stepKey="clickOnEditSimpleMsiProduct"/>
         <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
 
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminVerifySalableQuantityOfSourceAndStockForProductAfterRefundTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminVerifySalableQuantityOfSourceAndStockForProductAfterRefundTest.xml
index ad6fe55a2abb..34d200bfcbec 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminVerifySalableQuantityOfSourceAndStockForProductAfterRefundTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminVerifySalableQuantityOfSourceAndStockForProductAfterRefundTest.xml
@@ -31,6 +31,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <!--Admin Logout-->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!-- Logout from Storefront-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnDefaultSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnDefaultSourceTest.xml
index c95684952664..03b2b461d5a8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnDefaultSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnDefaultSourceTest.xml
@@ -93,7 +93,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedSource">
                 <argument name="sourceCode" value="$$createSource.source[source_code]$$"/>
             </actionGroup>
-
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnSingleStockModeTest.xml b/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnSingleStockModeTest.xml
index 81d85f4e7fcb..0f92fb5da1fc 100644
--- a/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnSingleStockModeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/BackordersEnabledOnProductPageAndAppliedToSimpleProductOnSingleStockModeTest.xml
@@ -54,6 +54,9 @@
             <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
         </before>
         <after>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWhenAllChildProductsAreOutOfStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWhenAllChildProductsAreOutOfStockTest.xml
index b84aa4a62944..df2847e4f08f 100755
--- a/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWhenAllChildProductsAreOutOfStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWhenAllChildProductsAreOutOfStockTest.xml
@@ -47,6 +47,9 @@
             <actionGroup ref="AdminDeleteCreatedColorAttributeActionGroup" stepKey="deleteBlueColorAttribute">
                 <argument name="Color" value="{{colorProductAttribute3.name}}"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWithDropDownAttributeOnTestStockGetOutOfStockWhenAllItsChildProductsGetOutOfStockOrDisabledTest.xml b/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWithDropDownAttributeOnTestStockGetOutOfStockWhenAllItsChildProductsGetOutOfStockOrDisabledTest.xml
index 62c551ecd5c8..34053ff417cb 100755
--- a/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWithDropDownAttributeOnTestStockGetOutOfStockWhenAllItsChildProductsGetOutOfStockOrDisabledTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ConfigurableProductWithDropDownAttributeOnTestStockGetOutOfStockWhenAllItsChildProductsGetOutOfStockOrDisabledTest.xml
@@ -48,6 +48,9 @@
                 <argument name="Color" value="{{colorProductAttribute1.name}}"/>
             </actionGroup>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/CreditMemoCreatedWithPartialRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipmentTest.xml b/InventoryAdminUi/Test/Mftf/Test/CreditMemoCreatedWithPartialRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipmentTest.xml
index 4243655ccf6d..70aa1f2e4e16 100644
--- a/InventoryAdminUi/Test/Mftf/Test/CreditMemoCreatedWithPartialRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipmentTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/CreditMemoCreatedWithPartialRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipmentTest.xml
@@ -40,6 +40,9 @@
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/CustomerReorderDownloadableProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/CustomerReorderDownloadableProductCustomStockTest.xml
index b2cd262eca42..b81367c6727b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/CustomerReorderDownloadableProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/CustomerReorderDownloadableProductCustomStockTest.xml
@@ -23,6 +23,7 @@
             <createData entity="MsiCustomer1" stepKey="customer" after="linkSourceStock1"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer" after="deleteCustomStock"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/GroupedProductCreatedWithChildProductsOnDefaultStockByAdminUserTest.xml b/InventoryAdminUi/Test/Mftf/Test/GroupedProductCreatedWithChildProductsOnDefaultStockByAdminUserTest.xml
index 04583476fcc3..3798cf5400e6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GroupedProductCreatedWithChildProductsOnDefaultStockByAdminUserTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GroupedProductCreatedWithChildProductsOnDefaultStockByAdminUserTest.xml
@@ -120,6 +120,9 @@
             <!--Disable all sources.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="deleteSource"/>
             <!--Admin logout-->
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
         <!-- Find the product that we just created using the product grid -->
diff --git a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreateOrderWithSimpleProductOnCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreateOrderWithSimpleProductOnCustomStockTest.xml
index 8824dc75e8a3..15af4d4d31f8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreateOrderWithSimpleProductOnCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreateOrderWithSimpleProductOnCustomStockTest.xml
@@ -75,6 +75,7 @@
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
                 <argument name="tags" value=""/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreatedOrderWithSimpleProductFromHomepageWithFreeShippingMethodTest.xml b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreatedOrderWithSimpleProductFromHomepageWithFreeShippingMethodTest.xml
index 828bdac1e2bc..324b5e8131ac 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreatedOrderWithSimpleProductFromHomepageWithFreeShippingMethodTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreatedOrderWithSimpleProductFromHomepageWithFreeShippingMethodTest.xml
@@ -47,6 +47,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
         </after>
         <!-- Assign product to custom source -->
         <amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="openProductEditPage"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnCustomStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnCustomStockFromHomepageTest.xml
index 122ba8fc76a7..06491baabc96 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnCustomStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnCustomStockFromHomepageTest.xml
@@ -70,6 +70,9 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createStock" stepKey="deleteStock"/>
             <deleteData createDataKey="downloadableProduct" stepKey="deleteProduct"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnDefaultStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnDefaultStockFromHomepageTest.xml
index 6d26dd2c8293..7d7dccf15a27 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnDefaultStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedDownloadableProductOnDefaultStockFromHomepageTest.xml
@@ -49,6 +49,9 @@
             <magentoCLI stepKey="disableGuestCheckoutForDownloadable" command="config:set catalog/downloadable/disable_guest_checkout 1" />
             <magentoCLI stepKey="disableShareableDownloadableItems" command="config:set catalog/downloadable/shareable 0" />
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedVirtualProductOnDefaultSourceFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedVirtualProductOnDefaultSourceFromHomepageTest.xml
index 8b77c3b0643a..4c8ee59c7925 100644
--- a/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedVirtualProductOnDefaultSourceFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/GuestCustomerOrderedVirtualProductOnDefaultSourceFromHomepageTest.xml
@@ -56,6 +56,7 @@
             <comment userInput="BIC workaround" stepKey="disableCustomSource"/>
             <comment userInput="BIC workaround" stepKey="saveAndCloseCustomSource"/>
 
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
 
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreateOrderWithSimpleProductOnDefaultStockFromMainWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreateOrderWithSimpleProductOnDefaultStockFromMainWebsiteTest.xml
index bead16f8390d..6c9419830b6a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreateOrderWithSimpleProductOnDefaultStockFromMainWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreateOrderWithSimpleProductOnDefaultStockFromMainWebsiteTest.xml
@@ -63,6 +63,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedCustomSource">
                 <argument name="sourceCode" value="$$customSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
 
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreatedOrderWithSimpleProductOnTestStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreatedOrderWithSimpleProductOnTestStockFromHomepageTest.xml
index 027bb29fef4e..539af07bf14e 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreatedOrderWithSimpleProductOnTestStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerCreatedOrderWithSimpleProductOnTestStockFromHomepageTest.xml
@@ -45,6 +45,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableThirdCreatedSource">
                 <argument name="sourceCode" value="$$createSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderGroupedProductCustomStockTest.xml
index edb943383dd0..65446e1350e8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderGroupedProductCustomStockTest.xml
@@ -44,6 +44,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedCustomSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Remove test data.-->
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedGroupedProductWithChildProductsAssignedToDefaultStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedGroupedProductWithChildProductsAssignedToDefaultStockFromHomepageTest.xml
index e8ea3b40c888..a9c10b82eadf 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedGroupedProductWithChildProductsAssignedToDefaultStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedGroupedProductWithChildProductsAssignedToDefaultStockFromHomepageTest.xml
@@ -20,6 +20,7 @@
             <group value="multi_mode"/>
             <group value="pr_exclude"/>
         </annotations>
+
         <before>
             <remove keyForRemoval="navigateToStockListPage"/>
             <remove keyForRemoval="waitForStockListPageLoad"/>
@@ -29,6 +30,9 @@
             <remove keyForRemoval="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <remove keyForRemoval="saveDefaultStock"/>
         </before>
+        <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
+        </after>
         <remove keyForRemoval="createNewOrderForCustomer"/>
         <remove keyForRemoval="clickOnDefaultStoreViewIfPresent1"/>
         <remove keyForRemoval="waitForPageLoad3"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedSimpleProductFromTestSourceUsingMultiShipmentsToSeveralAddressesTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedSimpleProductFromTestSourceUsingMultiShipmentsToSeveralAddressesTest.xml
index 3f0e39846664..4555e21a7469 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedSimpleProductFromTestSourceUsingMultiShipmentsToSeveralAddressesTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerOrderedSimpleProductFromTestSourceUsingMultiShipmentsToSeveralAddressesTest.xml
@@ -21,9 +21,13 @@
             <group value="multi_mode"/>
             <group value="pr_exclude"/>
         </annotations>
+
         <before>
             <remove keyForRemoval="assignStockToAdditionalWebsite"/>
         </before>
+        <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="deleteSimpleProduct"/>
+        </after>
 
         <remove keyForRemoval="assignTestSourceToCreatedProduct"/>
         <remove keyForRemoval="setProductQuantity"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnDefaultStockTest.xml
index ad3d49bb1ab6..650b7a27bed8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnDefaultStockTest.xml
@@ -46,6 +46,7 @@
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <!--Disable additional source.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnTestStockTest.xml
index 1b5d5e46c307..e56084adfe7f 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderSimpleProductOnTestStockTest.xml
@@ -58,6 +58,7 @@
             </actionGroup>
             <deleteData createDataKey="additionalStock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnDefaultStockTest.xml
index f4392e4d9ce6..ce1c56239fd3 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnDefaultStockTest.xml
@@ -36,6 +36,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnTestStockTest.xml
index 6d981a88b9a9..f91ef3259644 100644
--- a/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/LoggedInCustomerReorderVirtualProductOnTestStockTest.xml
@@ -59,6 +59,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="additionalStock" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/ManageStockOnConfigurationPageTurnedOffForBundleProductOnTestStockInAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/ManageStockOnConfigurationPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
index e053db779a53..084b425cc518 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ManageStockOnConfigurationPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ManageStockOnConfigurationPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
@@ -37,6 +37,9 @@
             <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
             <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/ManageStockOnProductPageTurnedOffForBundleProductOnTestStockInAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/ManageStockOnProductPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
index 5a8c8767b668..f2f7274deac6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ManageStockOnProductPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ManageStockOnProductPageTurnedOffForBundleProductOnTestStockInAdminTest.xml
@@ -34,6 +34,9 @@
             <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
             <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmCustomStockTestTwoItemsDeductionTest.xml b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmCustomStockTestTwoItemsDeductionTest.xml
index f1bb2f26e5f4..faca131767f4 100644
--- a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmCustomStockTestTwoItemsDeductionTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmCustomStockTestTwoItemsDeductionTest.xml
@@ -10,6 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="OfflineDistanceBasedSelectionAlgorithmCustomStockTestTwoItemsDeductionTest">
         <annotations>
+            <features value="Inventory"/>
             <stories value="Offline Distance based source Selection Algorithm with simple product on custom stock with two items to deduct."/>
             <title value="Offline Distance Based Source Selection Algorithm with simple product on custom stock with two items to deduct."/>
             <description value="Check, 'Offline Distance Based Source Selection Algorithm' select corrects source for simple product on custom stock with two items to deduct."/>
@@ -17,12 +18,8 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
-            <skip>
-                <issueId value="https://github.com/magento/inventory/issues/2690"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
-
         <before>
             <!--Enable "Manage Stock", set distance based algorithm to offline and download tables.-->
             <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableManageStock"/>
@@ -58,59 +55,32 @@
             <actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignUSSource1ToCreatedProduct">
                 <argument name="sourceCode" value="$$USSource1.source[source_code]$$"/>
             </actionGroup>
+            <waitForElementVisible selector="{{AdminProductSourcesGrid.rowQty('1')}}" stepKey="waitForUSSource1QtyField"/>
             <fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="5" stepKey="setUSSource1Quantity"/>
             <actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignUSSource2ToCreatedProduct">
                 <argument name="sourceCode" value="$$USSource2.source[source_code]$$"/>
             </actionGroup>
+            <waitForElementVisible selector="{{AdminProductSourcesGrid.rowQty('2')}}" stepKey="waitForUSSource2QtyField"/>
             <fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="5" stepKey="setUSSource2Quantity"/>
             <actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignUASource1ToCreatedProduct">
                 <argument name="sourceCode" value="$$UASource1.source[source_code]$$"/>
             </actionGroup>
+            <waitForElementVisible selector="{{AdminProductSourcesGrid.rowQty('3')}}" stepKey="waitForUASource1QtyField"/>
             <fillField selector="{{AdminProductSourcesGrid.rowQty('3')}}" userInput="5" stepKey="setUASource1Quantity"/>
+            <waitForElementClickable selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButton"/>
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedSimpleProduct"/>
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
-            </actionGroup>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
-                <argument name="tags" value=""/>
-            </actionGroup>
         </before>
         <after>
+            <!--Revert config changes.-->
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="revertManageStock"/>
+            <magentoCLI command="config:set cataloginventory/source_selection_distance_based/provider offline" stepKey="revertSelectionAlgorithm"/>
             <!--Disable created sources.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
-            <comment userInput="BIC workaround" stepKey="navigateToSourceList"/>
-            <comment userInput="BIC workaround" stepKey="clearSourcesFilter"/>
-            <comment userInput="BIC workaround" stepKey="filterUSSource1BySourceCode"/>
-            <comment userInput="BIC workaround" stepKey="clickEditUSSource1"/>
-            <comment userInput="BIC workaround" stepKey="waitForUSSource1EditPageLoad"/>
-            <comment userInput="BIC workaround" stepKey="disableUSSource1"/>
-            <comment userInput="BIC workaround" stepKey="saveAndCloseUSSource1"/>
-
-            <comment userInput="BIC workaround" stepKey="filterUSSource2BySourceCode"/>
-            <comment userInput="BIC workaround" stepKey="clickEditUSSource2"/>
-            <comment userInput="BIC workaround" stepKey="waitForUSSource2EditPageLoad"/>
-            <comment userInput="BIC workaround" stepKey="disableUSSource2"/>
-            <comment userInput="BIC workaround" stepKey="saveAndCloseUSSource2"/>
-
-            <comment userInput="BIC workaround" stepKey="filterUASource1BySourceCode"/>
-            <comment userInput="BIC workaround" stepKey="clickEditUASource1"/>
-            <comment userInput="BIC workaround" stepKey="waitForUASource1EditPageLoad"/>
-            <comment userInput="BIC workaround" stepKey="disableUASource1"/>
-            <comment userInput="BIC workaround" stepKey="saveAndCloseUASource1"/>
-
             <!--Assign Main Website to Default Stock.-->
             <actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
-            <comment userInput="BIC workaround" stepKey="navigateToStockListPage"/>
-            <comment userInput="BIC workaround" stepKey="waitForStockListPageLoad"/>
-            <comment userInput="BIC workaround" stepKey="searchDefaultStockByName"/>
-            <comment userInput="BIC workaround" stepKey="clickEditDefaultStock"/>
-            <comment userInput="BIC workaround" stepKey="waitFroDefaultStockEditPageLoad"/>
-            <comment userInput="BIC workaround" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
-            <comment userInput="BIC workaround" stepKey="saveDefaultStock"/>
-
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
@@ -118,9 +88,6 @@
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="additionalStock" stepKey="deleteAdditionalStock"/>
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
-            </actionGroup>
         </after>
         <!--Login Customer.-->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
@@ -134,46 +101,49 @@
             <argument name="checkQuantity" value="1"/>
         </actionGroup>
         <!--Place Order.-->
+        <waitForElementClickable selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="waitForGoToCheckoutClickable"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
         <waitForElementClickable selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="waitForFirstShippingMethodClickable" />
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectShippingMethod"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
         <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="navigateToSecondCheckoutStep"/>
-        <comment userInput="BIC workaround" stepKey="waitForPageLoad3"/>
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment"/>
-        <comment userInput="BIC workaround" stepKey="waitForPageLoad4"/>
-        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="chooseBillingAddress"/>
+        <waitForText userInput="{{US_Address_TX.street[0]}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="chooseBillingAddress"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
-        <comment userInput="BIC workaround" stepKey="waitForPageLoad5"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
-        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="checkOrderPlaceSuccessMessage"/>
+        <waitForText userInput="Your order number is:" selector="{{CheckoutSuccessMainSection.success}}" stepKey="checkOrderPlaceSuccessMessage"/>
 
         <!--Create Shipment-->
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
             <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
+        <waitForElementClickable selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="waitForShipClickable"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
 
         <!--Verify Distance Based Source Selection Algorithm.-->
+        <waitForElementClickable selector="{{AdminSourceSelectionFormSection.sourceSelectionAlgorithmToggle}}" stepKey="waitForAlgorithmToggleClickable"/>
         <click selector="{{AdminSourceSelectionFormSection.sourceSelectionAlgorithmToggle}}" stepKey="openSourceSelectionAlgorithmList"/>
+        <waitForElementClickable selector="{{AdminSourceSelectionFormSection.selectDistancePriority}}" stepKey="waitForDistancePriorityClickable"/>
         <click selector="{{AdminSourceSelectionFormSection.selectDistancePriority}}" stepKey="selectDistancePriorityAlgorithm"/>
         <waitForLoadingMaskToDisappear stepKey="waitForAreaApplied"/>
 
         <!--Verify Distance Based Algorithm applied correctly.-->
-        <see selector="{{AdminSourceSelectionOrderedItemsGrid.rowProductSku('0')}}" userInput="$$simpleProduct.sku$$" stepKey="checkProductSku"/>
-        <see selector="{{AdminSourceSelectionOrderedItemsGrid.rowQtyToShip('0')}}" userInput="10" stepKey="checkQtyToShip"/>
-        <see selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','0')}}" userInput="$$USSource2.source[name]$$" stepKey="checkUSSource2Name"/>
+        <waitForText userInput="$$simpleProduct.sku$$" selector="{{AdminSourceSelectionOrderedItemsGrid.rowProductSku('0')}}" stepKey="checkProductSku"/>
+        <waitForText userInput="10" selector="{{AdminSourceSelectionOrderedItemsGrid.rowQtyToShip('0')}}" stepKey="checkQtyToShip"/>
+        <waitForText userInput="$$USSource2.source[name]$$" selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','0')}}" stepKey="checkUSSource2Name"/>
         <seeInField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('0','0')}}" userInput="5" stepKey="checkUSSource2Qty"/>
-        <see selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','1')}}" userInput="$$USSource1.source[name]$$" stepKey="checkUSSource1Name"/>
+        <waitForText userInput="$$USSource1.source[name]$$" selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','1')}}" stepKey="checkUSSource1Name"/>
         <seeInField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('0','1')}}" userInput="5" stepKey="checkUSSource1Qty"/>
-        <see selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','2')}}" userInput="$$UASource1.source[name]$$" stepKey="checkSourceName"/>
+        <waitForText userInput="$$UASource1.source[name]$$" selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesName('0','2')}}" stepKey="checkSourceName"/>
         <seeInField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('0','2')}}" userInput="0" stepKey="checkUASource1Qty"/>
         <!--Select first source and proceed to shipment.-->
+        <waitForElementVisible selector="{{AdminSourceSelectionFormSection.sourceSelection}}" stepKey="waitForSourceSelectionForUSSource2"/>
         <selectOption selector="{{AdminSourceSelectionFormSection.sourceSelection}}" userInput="$$USSource2.source[name]$$" stepKey="selectUSSource2ToCreateShipment"/>
+        <waitForElementClickable selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="waitForProceedToShipmentClickable"/>
         <click selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="createShipment"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Pending" stepKey="seeShipmentOrderStatusForUSSource2"/>
+        <waitForPageLoad stepKey="waitForShipmentPageUSSource2"/>
+        <waitForText userInput="Pending" selector="{{AdminShipmentOrderInformationSection.orderStatus}}" stepKey="seeShipmentOrderStatusForUSSource2"/>
         <actionGroup ref="VerifyBasicShipmentInformationActionGroup" stepKey="checkBasicShipmentOrderInfoForUSSource2">
             <argument name="customer" value="$$customer$$"/>
             <argument name="shippingAddress" value="US_Address_TX"/>
@@ -182,19 +152,24 @@
         <actionGroup ref="SeeProductInShipmentItemsActionGroup" stepKey="checkProductInShipmentForUSSource2">
             <argument name="product" value="$$simpleProduct$$"/>
         </actionGroup>
-        <see selector="{{AdminShipmentInventorySection.sourceList}}" userInput="$$USSource2.source[name]$$" stepKey="checkSourceNameOnShipmentPageForUSSource2"/>
+        <waitForText userInput="$$USSource2.source[name]$$" selector="{{AdminShipmentInventorySection.sourceList}}" stepKey="checkSourceNameOnShipmentPageForUSSource2"/>
         <!--Submit and verify shipment.-->
+        <waitForElementClickable selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="waitForSubmitShipmentForUSSource2"/>
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipmentForUSSource2"/>
+        <waitForPageLoad stepKey="waitForOrderPageAfterUSSource2Shipment"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShippingForUSSource2"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="checkShipmentCreateSuccessMessageForUSSource2"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="checkOrderStatusForUSSource2"/>
-        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 5" stepKey="checkShippedQuantityForUSSource2"/>
+        <waitForText userInput="The shipment has been created." selector="{{AdminOrderDetailsMessagesSection.successMessage}}" stepKey="checkShipmentCreateSuccessMessageForUSSource2"/>
+        <waitForText userInput="Processing" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" stepKey="checkOrderStatusForUSSource2"/>
+        <waitForText userInput="Shipped 5" selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" stepKey="checkShippedQuantityForUSSource2"/>
         <!--Select second source and proceed to shipment.-->
+        <waitForElementClickable selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="waitForShipForUSSource1Clickable"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipForUSSource1"/>
+        <waitForElementVisible selector="{{AdminSourceSelectionFormSection.sourceSelection}}" stepKey="waitForSourceSelectionForUSSource1"/>
         <selectOption selector="{{AdminSourceSelectionFormSection.sourceSelection}}" userInput="$$USSource1.source[name]$$" stepKey="selectUSSource1ToCreateShipment"/>
+        <waitForElementClickable selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="waitForProceedToShipmentForUSSource1Clickable"/>
         <click selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="createShipmentForUSSource1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoadForUSSource1"/>
-        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatusForUSSource1"/>
+        <waitForPageLoad stepKey="waitForPageLoadForUSSource1"/>
+        <waitForText userInput="Processing" selector="{{AdminShipmentOrderInformationSection.orderStatus}}" stepKey="seeShipmentOrderStatusForUSSource1"/>
         <actionGroup ref="VerifyBasicShipmentInformationActionGroup" stepKey="checkBasicShipmentOrderInfoForUSSource1">
             <argument name="customer" value="$$customer$$"/>
             <argument name="shippingAddress" value="US_Address_TX"/>
@@ -203,22 +178,26 @@
         <actionGroup ref="SeeProductInShipmentItemsActionGroup" stepKey="checkProductInShipmentForUSSource1">
             <argument name="product" value="$$simpleProduct$$"/>
         </actionGroup>
-        <see selector="{{AdminShipmentInventorySection.sourceList}}" userInput="$$USSource1.source[name]$$" stepKey="checkSourceNameOnShipmentPageForUSSource1"/>
+        <waitForText userInput="$$USSource1.source[name]$$" selector="{{AdminShipmentInventorySection.sourceList}}" stepKey="checkSourceNameOnShipmentPageForUSSource1"/>
         <!--Submit and verify shipment.-->
+        <waitForElementClickable selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="waitForSubmitShipmentForUSSource1"/>
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipmentForUSSource1"/>
+        <waitForPageLoad stepKey="waitForOrderPageAfterUSSource1Shipment"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShippingForUSSource1"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="checkShipmentCreateSuccessMessageForUSSource1"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="checkOrderStatusForUSSource1"/>
-        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 10" stepKey="checkShippedQuantityForUSSource1"/>
+        <waitForText userInput="The shipment has been created." selector="{{AdminOrderDetailsMessagesSection.successMessage}}" stepKey="checkShipmentCreateSuccessMessageForUSSource1"/>
+        <waitForText userInput="Processing" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" stepKey="checkOrderStatusForUSSource1"/>
+        <waitForText userInput="Shipped 10" selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" stepKey="checkShippedQuantityForUSSource1"/>
         <!--Verify product quantity.-->
+        <magentoCron stepKey="runCron"/>
+        <magentoCron stepKey="runCronAgain"/>
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPageForCheckProductQtyAfterCreateShipment"/>
         <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="findSimpleProductBySkuToCheckQtyAfterCreateShipment">
             <argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
             <argument name="value" value="$$simpleProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$USSource2.source[name]$$)}}" userInput="0" stepKey="checkUSSource2QtyAfterCreateShipment"/>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$USSource1.source[name]$$)}}" userInput="0" stepKey="checkUSSource1QtyAfterCreateShipment"/>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$UASource1.source[name]$$)}}" userInput="5" stepKey="checkUASource1QtyAfterCreateShipment"/>
-        <see selector="{{AdminProductGridSection.productSalableQty('1',$$additionalStock.stock[name]$$)}}" userInput="5" stepKey="checkSalableQtyAfterCreateShipment"/>
+        <waitForText userInput="0" selector="{{AdminProductGridSection.productQtyPerSource('1',$$USSource2.source[name]$$)}}" stepKey="checkUSSource2QtyAfterCreateShipment"/>
+        <waitForText userInput="0" selector="{{AdminProductGridSection.productQtyPerSource('1',$$USSource1.source[name]$$)}}" stepKey="checkUSSource1QtyAfterCreateShipment"/>
+        <waitForText userInput="5" selector="{{AdminProductGridSection.productQtyPerSource('1',$$UASource1.source[name]$$)}}" stepKey="checkUASource1QtyAfterCreateShipment"/>
+        <waitForText userInput="5" selector="{{AdminProductGridSection.productSalableQty('1',$$additionalStock.stock[name]$$)}}" stepKey="checkSalableQtyAfterCreateShipment"/>
     </test>
 </tests>
diff --git a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockNotSupportedCountryTest.xml b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockNotSupportedCountryTest.xml
index f2c724ce74bc..e950726dc38a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockNotSupportedCountryTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockNotSupportedCountryTest.xml
@@ -101,6 +101,7 @@
             <comment userInput="BIC workaround" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <comment userInput="BIC workaround" stepKey="saveDefaultStock"/>
 
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockTest.xml
index e05fcc32ea24..96751cd7c5d0 100644
--- a/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/OfflineDistanceBasedSelectionAlgorithmSimpleProductCustomStockTest.xml
@@ -102,6 +102,7 @@
             <comment userInput="BIC workaround" stepKey="selectDefaultWebsiteAsSalesChannelForDefaultStock"/>
             <comment userInput="BIC workaround" stepKey="saveDefaultStock"/>
 
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/ProductsSortingInStoreviewScopeInVisualMerchandiserOnCategoryPageInAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/ProductsSortingInStoreviewScopeInVisualMerchandiserOnCategoryPageInAdminTest.xml
index 1744e267d8b7..b2303893c1f3 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ProductsSortingInStoreviewScopeInVisualMerchandiserOnCategoryPageInAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ProductsSortingInStoreviewScopeInVisualMerchandiserOnCategoryPageInAdminTest.xml
@@ -63,6 +63,8 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
             <!--Clear Filter-->
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
             <!--Delete Stock-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductCustomStockTest.xml
index ee0b15bd312e..f7b18d4e7c49 100644
--- a/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductCustomStockTest.xml
@@ -79,6 +79,7 @@
             </actionGroup>
             <deleteData createDataKey="additionalStock" stepKey="deleteStock"/>
             <deleteData createDataKey="category" stepKey="deletecategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductDefaultStockTest.xml
index 133c5a9a63e3..0729c64a4f2a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/RegisteredCustomerReorderGroupedProductDefaultStockTest.xml
@@ -69,6 +69,7 @@
             <!--Disable additional source.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <deleteData createDataKey="category" stepKey="deletecategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonBundleProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonBundleProductDefaultStockTest.xml
index ae2b0229720d..a79d7f3f4959 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonBundleProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonBundleProductDefaultStockTest.xml
@@ -75,6 +75,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonDownlodableProductDefaultSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonDownlodableProductDefaultSourceTest.xml
index 70cb4b9dec28..08fe4a71e1e6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonDownlodableProductDefaultSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonDownlodableProductDefaultSourceTest.xml
@@ -45,6 +45,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonGroupedProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonGroupedProductOnTestStockTest.xml
index 08128b820035..456eb7d2483d 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonGroupedProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonGroupedProductOnTestStockTest.xml
@@ -39,6 +39,7 @@
             <!--Disable additional source.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableCustomSource"/>
             <deleteData createDataKey="category" stepKey="deletecategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonSimpleProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonSimpleProductOnDefaultStockTest.xml
index 740183a28fb5..d6aaef2ed873 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonSimpleProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonSimpleProductOnDefaultStockTest.xml
@@ -35,6 +35,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableThirdCreatedSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonVirtualProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonVirtualProductOnDefaultStockTest.xml
index 3eb10bcd15e7..2ed0a7f617db 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderButtonVirtualProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderButtonVirtualProductOnDefaultStockTest.xml
@@ -38,6 +38,7 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
diff --git a/InventoryAdminUi/Test/Mftf/Test/ReorderOfTheOrderWithSimpleProductOnTestStockFromAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/ReorderOfTheOrderWithSimpleProductOnTestStockFromAdminTest.xml
index 15ffe6aaf3f5..c0b8d0bc0e2d 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ReorderOfTheOrderWithSimpleProductOnTestStockFromAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ReorderOfTheOrderWithSimpleProductOnTestStockFromAdminTest.xml
@@ -49,6 +49,7 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="createStock" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/SimpleProductAssignedToTestWebsiteButNotAssignedToAnySourceCreatedByAdminUserTest.xml b/InventoryAdminUi/Test/Mftf/Test/SimpleProductAssignedToTestWebsiteButNotAssignedToAnySourceCreatedByAdminUserTest.xml
index 8b43d0a3ec29..65f72b1fdc9c 100755
--- a/InventoryAdminUi/Test/Mftf/Test/SimpleProductAssignedToTestWebsiteButNotAssignedToAnySourceCreatedByAdminUserTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/SimpleProductAssignedToTestWebsiteButNotAssignedToAnySourceCreatedByAdminUserTest.xml
@@ -53,6 +53,9 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockAndTestWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockAndTestWebsiteTest.xml
index 3048cc6828a2..5b27c6db510f 100755
--- a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockAndTestWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockAndTestWebsiteTest.xml
@@ -55,6 +55,9 @@
                 <argument name="indices" value=""/>
             </actionGroup>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockTest.xml
index 9e2592920f5a..0775cf7ac695 100755
--- a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockTest.xml
@@ -37,6 +37,9 @@
             <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
             <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnDefaultStockTest.xml
index 9494361a6241..b9fe0fbc6457 100755
--- a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnDefaultStockTest.xml
@@ -50,6 +50,9 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockAndTestWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockAndTestWebsiteTest.xml
index 674b4f3cee99..3adcb7f2b4e5 100755
--- a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockAndTestWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockAndTestWebsiteTest.xml
@@ -54,6 +54,9 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockTest.xml
index b6686924d4c9..1a292dc0f450 100755
--- a/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForConfigurableProductOnTestStockTest.xml
@@ -43,6 +43,9 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockCustomWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockCustomWebsiteTest.xml
index 7aa3bbbab7e1..7dcffa4c8d6b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockCustomWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockCustomWebsiteTest.xml
@@ -16,10 +16,6 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
-            <skip>
-                <issueId value="https://github.com/magento/inventory/issues/1821"/>
-            </skip>
-            <group value="pr_exclude"/>
         </annotations>
 
         <before>
@@ -124,6 +120,9 @@
         <amOnPage url="{{AdminProductEditPage.url($$bundleProduct.id$$)}}" stepKey="openBundleProductEditPage"/>
         <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{SourceStatusInStock.value}}" stepKey="selectOutOfStock"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <!-- Check product is visible on Storefront-->
         <actionGroup ref="StorefrontAssertProductOnCategoryPageAdditionalWebsiteActionGroup" stepKey="verifyProductOnCategoryPage">
             <argument name="categoryName" value="$category.name$"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockTest.xml
index 39d4fd28793b..96feaeef37bd 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontBundleProductChangeStockStatusCustomStockTest.xml
@@ -16,9 +16,6 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
-            <skip>
-                <issueId value="https://github.com/magento/inventory/issues/1821"/>
-            </skip>
         </annotations>
 
         <before>
@@ -87,6 +84,9 @@
         <amOnPage url="{{AdminProductEditPage.url($$bundleProduct.id$$)}}" stepKey="openBundleProductEditPage"/>
         <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{SourceStatusInStock.value}}" stepKey="selectOutOfStock"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <!-- Check product is visible on Storefront-->
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="verifyProductVisibleOnStorefront">
             <argument name="category" value="$category$"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontButtonReorderForTheOrderWithConfigurableProductOnTestStockInCustomerCabinetOnHomepageIsNotPresentIfProductSoldOutTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontButtonReorderForTheOrderWithConfigurableProductOnTestStockInCustomerCabinetOnHomepageIsNotPresentIfProductSoldOutTest.xml
index f8bd07218094..8a6ac45387f3 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontButtonReorderForTheOrderWithConfigurableProductOnTestStockInCustomerCabinetOnHomepageIsNotPresentIfProductSoldOutTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontButtonReorderForTheOrderWithConfigurableProductOnTestStockInCustomerCabinetOnHomepageIsNotPresentIfProductSoldOutTest.xml
@@ -28,6 +28,7 @@
             <remove keyForRemoval="assignMainWebsiteToDefaultStock"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <!--Assign Default Stock to Default Website.-->
             <actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock" before="logoutOfAdmin1">
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationConfigurableProductSoldOutInSingleStockModeTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationConfigurableProductSoldOutInSingleStockModeTest.xml
index c519e96dffa8..a2c08d06c7f1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationConfigurableProductSoldOutInSingleStockModeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationConfigurableProductSoldOutInSingleStockModeTest.xml
@@ -52,6 +52,7 @@
             <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableProductVariation"/>
             <deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutInSingleStockModeTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutInSingleStockModeTest.xml
index 53246f499f7b..ad021fe96a26 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutInSingleStockModeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutInSingleStockModeTest.xml
@@ -30,6 +30,7 @@
             </createData>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Clean up created data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutOnDefaultStockTest.xml
index e2079cf36296..28f1ee95b4b5 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontCacheValidationSimpleProductSoldOutOnDefaultStockTest.xml
@@ -30,6 +30,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Disable additional source.-->
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableThirdCreatedSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
index 7dd94e1d76a5..2b331ef2b030 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
@@ -80,6 +80,9 @@
             </actionGroup>
             <!--Delete all customers via API-->
             <helper class="Magento\Customer\Test\Mftf\Helper\CustomerApiHelper" method="deleteAllCustomersApi" stepKey="deleteAllCustomersViaApi"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <magentoCLI
                 command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductTextSwatchAttributeCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductTextSwatchAttributeCustomStockTest.xml
index 9e31775af648..24e489c991e0 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductTextSwatchAttributeCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductTextSwatchAttributeCustomStockTest.xml
@@ -67,6 +67,7 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!-- Delete configurable product and variants via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <!--Assign Default Stock to Main Website.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndCustomSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndCustomSourceTest.xml
index f70ad56dc743..257f24fd62a6 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndCustomSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndCustomSourceTest.xml
@@ -66,6 +66,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableProductVariation"/>
             <deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndDefaultSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndDefaultSourceTest.xml
index 5a4acb4e16ca..62a0fa12a842 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndDefaultSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderConfigurableProductWithDropDownAttributeAndDefaultSourceTest.xml
@@ -61,6 +61,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableProductVariation"/>
             <deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderDownloadableProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderDownloadableProductDefaultStockTest.xml
index 34722d35ee5f..be307f63cbc1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderDownloadableProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderDownloadableProductDefaultStockTest.xml
@@ -43,6 +43,7 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Delete test data.-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderedVirtualProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderedVirtualProductOnDefaultStockTest.xml
index 4cd398e60f98..ebb6e16ee927 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderedVirtualProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerOrderedVirtualProductOnDefaultStockTest.xml
@@ -53,6 +53,7 @@
             <createData entity="VirtualProduct" stepKey="product"/>
         </before>
         <after>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerReorderBundleProductOnCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerReorderBundleProductOnCustomStockTest.xml
index 6d9a49df8504..2eee6c166d7e 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerReorderBundleProductOnCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerReorderBundleProductOnCustomStockTest.xml
@@ -71,6 +71,7 @@
             </createData>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithDropDownAttributeTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithDropDownAttributeTest.xml
index 375b7292a5f5..cc27f23abe87 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithDropDownAttributeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithDropDownAttributeTest.xml
@@ -40,6 +40,7 @@
             </actionGroup>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
index b721810670ee..f77abb68fa40 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
@@ -41,6 +41,7 @@
             </actionGroup>
             <!-- Delete all products via API using ProductApiHelper -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <deleteData createDataKey="simpleCategory1" stepKey="deleteCategory1"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithVirtualProductByGuestCustomerTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithVirtualProductByGuestCustomerTest.xml
index 5fb9df2bb7b6..b3918ead0f8b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithVirtualProductByGuestCustomerTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithVirtualProductByGuestCustomerTest.xml
@@ -42,6 +42,7 @@
             <deleteData createDataKey="simpleCategory1" stepKey="deletesimpleCategory1"/>
             <!-- Delete virtual product created via UI -->
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderConfigurableProductsCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderConfigurableProductsCustomStockTest.xml
index 8ca8173fd19e..1bd101085f91 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderConfigurableProductsCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderConfigurableProductsCustomStockTest.xml
@@ -101,6 +101,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigurableVariation2"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logout"/>
             <remove keyForRemoval="deleteProduct"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductCustomStockTest.xml
index 1d637ecec798..d9c84e5c5f91 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductCustomStockTest.xml
@@ -41,6 +41,7 @@
             <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseSimpleProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logout"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <!--Assign Default Stock to Default Website.-->
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductsCustomStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductsCustomStockTest.xml
index acdd0eb90089..4a4f2d47672a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductsCustomStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontQuickOrderSimpleProductsCustomStockTest.xml
@@ -56,6 +56,7 @@
             <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseSimpleProduct2"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logout"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="product" stepKey="deleteSimpleProduct2"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnDefaultStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnDefaultStockFromHomepageTest.xml
index e7ad2742f154..6c62f3b124a8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnDefaultStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnDefaultStockFromHomepageTest.xml
@@ -61,6 +61,7 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="product" stepKey="deleteConfigurableProductVariation"/>
             <deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnTestStockFromHomepageTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnTestStockFromHomepageTest.xml
index ee8f30903c92..545856f99098 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnTestStockFromHomepageTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontReorderOfTheOrderWithConfigurableProductWithDropDownAttributeOnTestStockFromHomepageTest.xml
@@ -66,6 +66,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="product" stepKey="deleteConfigurableProductVariation"/>
             <deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForGroupedProductAfterPlacingOrderCountedCorrectlyTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForGroupedProductAfterPlacingOrderCountedCorrectlyTest.xml
index eba49b235439..5a85f67fa0b1 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForGroupedProductAfterPlacingOrderCountedCorrectlyTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForGroupedProductAfterPlacingOrderCountedCorrectlyTest.xml
@@ -44,6 +44,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedCustomSource">
                 <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForVirtualProductAfterCancellationOfOrderCountedCorrectlyTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForVirtualProductAfterCancellationOfOrderCountedCorrectlyTest.xml
index 9648a9a272a5..8ea517fd3c9b 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForVirtualProductAfterCancellationOfOrderCountedCorrectlyTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontSalableQuantityOnNonDefaultStockForVirtualProductAfterCancellationOfOrderCountedCorrectlyTest.xml
@@ -40,6 +40,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutFromAdminArea"/>
             <!--Assign Default Stock to Main Website.-->
             <actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontSimpleProductAssignedToNonDefaultSourceCreatedByAdminUserTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontSimpleProductAssignedToNonDefaultSourceCreatedByAdminUserTest.xml
index c256db582531..7552b7395269 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontSimpleProductAssignedToNonDefaultSourceCreatedByAdminUserTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontSimpleProductAssignedToNonDefaultSourceCreatedByAdminUserTest.xml
@@ -44,6 +44,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryAdminUi/Test/Mftf/Test/TwentyTwoSourcesAssignedToTheStockByAdminUserTest.xml b/InventoryAdminUi/Test/Mftf/Test/TwentyTwoSourcesAssignedToTheStockByAdminUserTest.xml
index 33d840a3b2ed..3eb193289ee6 100755
--- a/InventoryAdminUi/Test/Mftf/Test/TwentyTwoSourcesAssignedToTheStockByAdminUserTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/TwentyTwoSourcesAssignedToTheStockByAdminUserTest.xml
@@ -49,6 +49,9 @@
                 <argument name="sourceName21" value="$$createTestSource21.source[name]$$" />
                 <argument name="sourceName22" value="$$createTestSource22.source[name]$$" />
             </actionGroup>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
diff --git a/InventoryAdminUi/Test/Mftf/Test/ValidateAfterPlacingAnOrderWithZeroStatusAsOrderedPartialAndBackOrderedAccordinglyTest.xml b/InventoryAdminUi/Test/Mftf/Test/ValidateAfterPlacingAnOrderWithZeroStatusAsOrderedPartialAndBackOrderedAccordinglyTest.xml
index d56caf73fa54..5c223c44ba90 100644
--- a/InventoryAdminUi/Test/Mftf/Test/ValidateAfterPlacingAnOrderWithZeroStatusAsOrderedPartialAndBackOrderedAccordinglyTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/ValidateAfterPlacingAnOrderWithZeroStatusAsOrderedPartialAndBackOrderedAccordinglyTest.xml
@@ -197,6 +197,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="deleteSource">
                 <argument name="sourceCode" value="$source.source[source_code]$"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/VerifyThatMessageOnlyZeroLeftNotAppearedOnSimpleProductPageOnFrontendTest.xml b/InventoryAdminUi/Test/Mftf/Test/VerifyThatMessageOnlyZeroLeftNotAppearedOnSimpleProductPageOnFrontendTest.xml
index 322877d2e4d7..ae33fb078a66 100644
--- a/InventoryAdminUi/Test/Mftf/Test/VerifyThatMessageOnlyZeroLeftNotAppearedOnSimpleProductPageOnFrontendTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/VerifyThatMessageOnlyZeroLeftNotAppearedOnSimpleProductPageOnFrontendTest.xml
@@ -64,6 +64,9 @@
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
                 <argument name="tags" value="full_page"/>
             </actionGroup>
+            <amOnPage url="{{AdminManageStockPage.url}}" stepKey="goToStockGridBeforeClearFilters"/>
+            <waitForPageLoad stepKey="waitForStockGridLoad"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearInventoryStockListingFiltersAfter"/>
         </after>
 
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct1">
diff --git a/InventoryAdminUi/Test/Mftf/test-dependency-allowlist b/InventoryAdminUi/Test/Mftf/test-dependency-allowlist
index 0b7b951dff6f..00c446c832fd 100644
--- a/InventoryAdminUi/Test/Mftf/test-dependency-allowlist
+++ b/InventoryAdminUi/Test/Mftf/test-dependency-allowlist
@@ -61,4 +61,7 @@ SingleShippingSection
 BillingAgreement
 AdminLeftNavigationMenuSubTitlesVisibleTest
 AdminMenuSection
+AdminOrdersGridClearFiltersActionGroup
 NewProduct
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/InventoryAdvancedCheckout/Test/Mftf/Test/CreateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml b/InventoryAdvancedCheckout/Test/Mftf/Test/CreateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml
index 169b12e2eed5..9623e01e29ce 100644
--- a/InventoryAdvancedCheckout/Test/Mftf/Test/CreateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml
+++ b/InventoryAdvancedCheckout/Test/Mftf/Test/CreateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml
@@ -95,6 +95,9 @@
             </actionGroup>
             <!--Delete all customers via API-->
             <helper class="Magento\Customer\Test\Mftf\Helper\CustomerApiHelper" method="deleteAllCustomersApi" stepKey="deleteAllCustomersViaApi"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout" before="deleteStock"/>
             <deleteData createDataKey="additionalStock" stepKey="deleteStock" before="deleteConfigChildProductOne"/>
             <!--Revert "Add Store Code To URL" configuration.-->
diff --git a/InventoryAdvancedCheckout/Test/Mftf/test-dependency-allowlist b/InventoryAdvancedCheckout/Test/Mftf/test-dependency-allowlist
index 8474a0ea6c25..565627478cd7 100644
--- a/InventoryAdvancedCheckout/Test/Mftf/test-dependency-allowlist
+++ b/InventoryAdvancedCheckout/Test/Mftf/test-dependency-allowlist
@@ -8,3 +8,5 @@ AddConfigurableProductBySkuFromCustomerAccountTest
 AddSimpleProductBySkuFromCustomerAccountTest
 AddSimpleOutOfStockProductBySkuFromCustomerAccountTest
 RegisterCustomOnStorefrontActionGroup
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/InventoryApi/Test/Fixture/Stock.php b/InventoryApi/Test/Fixture/Stock.php
index e5af48dc95ac..2d00dd4e46b9 100644
--- a/InventoryApi/Test/Fixture/Stock.php
+++ b/InventoryApi/Test/Fixture/Stock.php
@@ -7,6 +7,7 @@
 
 namespace Magento\InventoryApi\Test\Fixture;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DataObject;
 use Magento\InventoryApi\Api\Data\StockInterface;
 use Magento\InventoryApi\Api\StockRepositoryInterface;
@@ -30,16 +31,23 @@ class Stock implements RevertibleDataFixtureInterface
      */
     private ProcessorInterface $dataProcessor;
 
+    /**
+     * @var ResourceConnection $resourceConnection
+     */
+    private $resourceConnection;
+
     /**
      * @param ServiceFactory $serviceFactory
      * @param ProcessorInterface $dataProcessor
      */
     public function __construct(
         ServiceFactory $serviceFactory,
-        ProcessorInterface $dataProcessor
+        ProcessorInterface $dataProcessor,
+        ResourceConnection $resourceConnection
     ) {
         $this->serviceFactory = $serviceFactory;
         $this->dataProcessor = $dataProcessor;
+        $this->resourceConnection = $resourceConnection;
     }
 
     /**
@@ -62,8 +70,14 @@ public function apply(array $data = []): ?DataObject
      */
     public function revert(DataObject $data): void
     {
+        $stockId = $data['stock_id'];
+
         $service = $this->serviceFactory->create(StockRepositoryInterface::class, 'deleteById');
-        $service->execute(['stockId' => $data['stock_id']]);
+        $service->execute(['stockId' => $stockId]);
+
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = 'inventory_stock_' . $stockId;
+        $connection->dropTable($tableName);
     }
 
     /**
diff --git a/InventoryBundleProduct/Test/Mftf/Test/StorefrontBundleProductOutOfStockWhenChildProductIsOutOfStockTest.xml b/InventoryBundleProduct/Test/Mftf/Test/StorefrontBundleProductOutOfStockWhenChildProductIsOutOfStockTest.xml
index cdfbcb41292f..01f0f7f95e07 100644
--- a/InventoryBundleProduct/Test/Mftf/Test/StorefrontBundleProductOutOfStockWhenChildProductIsOutOfStockTest.xml
+++ b/InventoryBundleProduct/Test/Mftf/Test/StorefrontBundleProductOutOfStockWhenChildProductIsOutOfStockTest.xml
@@ -223,6 +223,7 @@
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
                 <argument name="tags" value=""/>
             </actionGroup>
+            <actionGroup ref="AdminResetFilterInManageSourcesGridActionGroup" stepKey="resetManageSourcesGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
         <!--Verify simple product1, simple product 2 and simple product 3 is visible in category front page -->
diff --git a/InventoryBundleProduct/Test/Mftf/test-dependency-allowlist b/InventoryBundleProduct/Test/Mftf/test-dependency-allowlist
index 864f4354d3d7..b60735443666 100644
--- a/InventoryBundleProduct/Test/Mftf/test-dependency-allowlist
+++ b/InventoryBundleProduct/Test/Mftf/test-dependency-allowlist
@@ -5,4 +5,5 @@ AssignWebsiteToStockActionGroup
 AssignSourceToProductActionGroup
 AdminFillSourceQtyOnProductEditPageActionGroup
 AdminChangeSourceStockStatusActionGroup
+AdminResetFilterInManageSourcesGridActionGroup
 AdminApplyMinAndMaxQtyOnProductEditPageActionGroup
diff --git a/InventoryBundleProduct/Test/Mftf/test-dependency-errors-detailed b/InventoryBundleProduct/Test/Mftf/test-dependency-errors-detailed
index ab1348be8eb5..2224500d3892 100644
--- a/InventoryBundleProduct/Test/Mftf/test-dependency-errors-detailed
+++ b/InventoryBundleProduct/Test/Mftf/test-dependency-errors-detailed
@@ -9,3 +9,4 @@ contains entity references that violate dependency constraints:
 	 AssignSourceToProductActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminFillSourceQtyOnProductEditPageActionGroup from module(s): magento/module-inventory-admin-ui
 	 AdminChangeSourceStockStatusActionGroup from module(s): magento/module-inventory-admin-ui
+	 AdminResetFilterInManageSourcesGridActionGroup from module(s): magento/module-inventory-admin-ui
diff --git a/InventoryBundleProductIndexer/Test/Integration/Indexer/PriceIndexerTest.php b/InventoryBundleProductIndexer/Test/Integration/Indexer/PriceIndexerTest.php
index 10f29d22607a..4a973aa6a58d 100644
--- a/InventoryBundleProductIndexer/Test/Integration/Indexer/PriceIndexerTest.php
+++ b/InventoryBundleProductIndexer/Test/Integration/Indexer/PriceIndexerTest.php
@@ -39,6 +39,16 @@
     DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
     DataFixture(SourceFixture::class, as: 'source2'),
     DataFixture(StockFixture::class, as: 'stock2'),
+    DataFixture(
+        StockSourceLinksFixture::class,
+        [
+            ['stock_id' => '$stock2.stock_id$', 'source_code' => '$source2.source_code$'],
+        ]
+    ),
+    DataFixture(
+        StockSalesChannelsFixture::class,
+        ['stock_id' => '$stock2.stock_id$', 'sales_channels' => ['$website2.code$']]
+    ),
     DataFixture(ProductFixture::class, ['website_ids' => ['1', '$website2.id$'], 'price' => 10], 'product1'),
     DataFixture(ProductFixture::class, ['website_ids' => ['1', '$website2.id$'], 'price' => 20], 'product2'),
     DataFixture(ProductFixture::class, ['website_ids' => ['1', '$website2.id$'], 'price' => 5], 'product3'),
@@ -52,16 +62,6 @@
         ['website_ids' => ['1', '$website2.id$'], 'price' => 8, 'status' => 2],
         'product9'
     ),
-    DataFixture(
-        StockSourceLinksFixture::class,
-        [
-            ['stock_id' => '$stock2.stock_id$', 'source_code' => '$source2.source_code$'],
-        ]
-    ),
-    DataFixture(
-        StockSalesChannelsFixture::class,
-        ['stock_id' => '$stock2.stock_id$', 'sales_channels' => ['$website2.code$']]
-    ),
     DataFixture(
         SourceItemsFixture::class,
         [
diff --git a/InventoryBundleProductIndexer/Test/Integration/Indexer/SkuListsProcessorTest.php b/InventoryBundleProductIndexer/Test/Integration/Indexer/SkuListsProcessorTest.php
index 7d01de27b514..d5604b4b8983 100644
--- a/InventoryBundleProductIndexer/Test/Integration/Indexer/SkuListsProcessorTest.php
+++ b/InventoryBundleProductIndexer/Test/Integration/Indexer/SkuListsProcessorTest.php
@@ -13,6 +13,7 @@
 use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
 use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Indexer\Test\Fixture\Indexer as IndexerFixture;
 use Magento\InventoryApi\Api\Data\StockInterface;
 use Magento\InventoryApi\Api\GetSourceItemsBySkuInterface;
 use Magento\InventoryApi\Api\SourceItemsSaveInterface;
@@ -27,10 +28,14 @@
 use Magento\InventoryReservations\Test\Fixture\Reservation as ReservationFixture;
 use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
 use Magento\InventorySalesApi\Test\Fixture\StockSalesChannels as StockSalesChannelsFixture;
+use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Store\Test\Fixture\Website as WebsiteFixture;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorage;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Fixture\ScopeFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -86,6 +91,10 @@ protected function setUp(): void
 
     #[
         DbIsolation(false),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
         DataFixture(SourceFixture::class, ['source_code' => 's2'], 'source2'),
         DataFixture(SourceFixture::class, ['source_code' => 's3'], 'source3'),
         DataFixture(StockFixture::class, as: 'stock2'),
@@ -98,17 +107,20 @@ protected function setUp(): void
         ),
         DataFixture(
             StockSalesChannelsFixture::class,
-            ['stock_id' => '$stock2.stock_id$', 'sales_channels' => ['base']]
+            ['stock_id' => '$stock2.stock_id$', 'sales_channels' => ['$website2.code$']]
         ),
-
         DataFixture(
             ProductFixture::class,
-            ['sku' => 'simple1', 'stock_item' => ['use_config_min_qty' => 0, 'min_qty' => 2]],
+            [
+                'sku' => 'simple1',
+                'website_ids' => ['1', '$website2.id$'],
+                'stock_item' => ['use_config_min_qty' => 0, 'min_qty' => 2],
+            ],
             's1'
         ),
-        DataFixture(ProductFixture::class, ['sku' => 'simple2'], 's2'),
-        DataFixture(ProductFixture::class, ['sku' => 'simple3'], 's3'),
-        DataFixture(ProductFixture::class, ['sku' => 'simple4'], 's4'),
+        DataFixture(ProductFixture::class, ['sku' => 'simple2', 'website_ids' => ['1', '$website2.id$']], 's2'),
+        DataFixture(ProductFixture::class, ['sku' => 'simple3', 'website_ids' => ['1', '$website2.id$']], 's3'),
+        DataFixture(ProductFixture::class, ['sku' => 'simple4', 'website_ids' => ['1', '$website2.id$']], 's4'),
         DataFixture(
             SourceItemsFixture::class,
             [
@@ -136,7 +148,6 @@ protected function setUp(): void
                 ],
             ]
         ),
-
         DataFixture(
             BundleSelectionFixture::class,
             ['sku' => '$s1.sku$', 'qty' => 3, 'can_change_quantity' => 0],
@@ -162,8 +173,14 @@ protected function setUp(): void
         DataFixture(BundleOptionFixture::class, ['product_links' => ['$link4$'], 'required' => false], 'opt3'),
         DataFixture(
             BundleProductFixture::class,
-            ['sku' => 'bundle1', '_options' => ['$opt1$', '$opt2$', '$opt3$'], 'shipment_type' => 1]
+            [
+                'sku' => 'bundle1',
+                'website_ids' => ['1', '$website2.id$'],
+                '_options' => ['$opt1$', '$opt2$', '$opt3$'],
+                'shipment_type' => 1,
+            ]
         ),
+        DataFixture(IndexerFixture::class),
         DataProvider('executeListDataProvider')
     ]
     /**
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
similarity index 97%
rename from dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
index ecfc6e7673dc..bbc1f296cbc6 100644
--- a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
+++ b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
@@ -7,6 +7,7 @@
 
 namespace Magento\TestModuleInventoryStateCache\Plugin\CatalogInventory\Model\StockRegistryProvider;
 
+use Closure;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
@@ -57,7 +58,7 @@ public function __construct(
      * Get non cached stock items for product.
      *
      * @param StockRegistryProviderInterface $subject
-     * @param \Closure $proceed
+     * @param Closure $proceed
      * @param int|null $productId
      * @param int|null $stockId
      * @return StockItemInterface
@@ -65,7 +66,7 @@ public function __construct(
      */
     public function aroundGetStockItem(
         StockRegistryProviderInterface $subject,
-        \Closure $proceed,
+        Closure $proceed,
         ?int $productId,
         ?int $stockId
     ): StockItemInterface {
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/di.xml b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/di.xml
similarity index 100%
rename from dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/di.xml
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/di.xml
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/events.xml b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/events.xml
similarity index 100%
rename from dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/events.xml
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/events.xml
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml
similarity index 100%
rename from dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/module.xml b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/module.xml
similarity index 100%
rename from dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/module.xml
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/etc/module.xml
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/registration.php b/InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/registration.php
similarity index 100%
rename from dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/registration.php
rename to InventoryCache/Test/_files/Magento/TestModuleInventoryStateCache/registration.php
diff --git a/InventoryCatalog/Model/GetStockIdForCurrentWebsite.php b/InventoryCatalog/Model/GetStockIdForCurrentWebsite.php
index afb9ae2f6aef..46acfa4c39b3 100644
--- a/InventoryCatalog/Model/GetStockIdForCurrentWebsite.php
+++ b/InventoryCatalog/Model/GetStockIdForCurrentWebsite.php
@@ -8,10 +8,11 @@
 namespace Magento\InventoryCatalog\Model;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 use Magento\InventorySalesApi\Api\StockResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\HTTP\PhpEnvironment\Request;
 
 /**
  * Service for get stock id for current website.
@@ -56,7 +57,11 @@ public function __construct(
     public function execute(): int
     {
         $storeId = $this->request->getParam('store');
-        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+        try {
+            $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+        } catch (NoSuchEntityException $e) {
+            $websiteId = $this->storeManager->getStore()->getWebsiteId();
+        }
         $websiteCode = $this->storeManager->getWebsite($websiteId)->getCode();
 
         $stock = $this->stockResolver->execute(SalesChannelInterface::TYPE_WEBSITE, $websiteCode);
diff --git a/InventoryCatalog/Test/Api/DeleteProductTest.php b/InventoryCatalog/Test/Api/DeleteProductTest.php
index 5ccbcd9e56e0..7b72b970b351 100644
--- a/InventoryCatalog/Test/Api/DeleteProductTest.php
+++ b/InventoryCatalog/Test/Api/DeleteProductTest.php
@@ -102,9 +102,6 @@ private function rejectMessages()
             'inventory.source.items.cleanup',
             $this->defaultValueProvider->getConnection()
         );
-        if ($this->defaultValueProvider->getConnection() === 'stomp') {
-            $queue->subscribeQueue();
-        }
         while ($envelope = $queue->dequeue()) {
             $queue->reject($envelope, false);
         }
diff --git a/InventoryCatalog/Test/Api/UpdateProductSkuTest.php b/InventoryCatalog/Test/Api/UpdateProductSkuTest.php
index c518124c89f2..a9f9169fee04 100644
--- a/InventoryCatalog/Test/Api/UpdateProductSkuTest.php
+++ b/InventoryCatalog/Test/Api/UpdateProductSkuTest.php
@@ -123,9 +123,6 @@ private function rejectMessages()
             'inventory.source.items.cleanup',
             $this->defaultValueProvider->getConnection()
         );
-        if ($this->defaultValueProvider->getConnection() === 'stomp') {
-            $queue->subscribeQueue();
-        }
         while ($envelope = $queue->dequeue()) {
             $queue->reject($envelope, false);
         }
diff --git a/InventoryCatalog/Test/Api/UpdateProductTypeTest.php b/InventoryCatalog/Test/Api/UpdateProductTypeTest.php
index 8a83308e270d..e932174d0b7d 100644
--- a/InventoryCatalog/Test/Api/UpdateProductTypeTest.php
+++ b/InventoryCatalog/Test/Api/UpdateProductTypeTest.php
@@ -104,9 +104,6 @@ private function rejectMessages()
             'inventory.source.items.cleanup',
             $this->defaultValueProvider->getConnection()
         );
-        if ($this->defaultValueProvider->getConnection() === 'stomp') {
-            $queue->subscribeQueue();
-        }
         while ($envelope = $queue->dequeue()) {
             $queue->reject($envelope, false);
         }
diff --git a/InventoryCatalog/Test/Integration/CompositeProductReindexOnNonDefaultStockTest.php b/InventoryCatalog/Test/Integration/CompositeProductReindexOnNonDefaultStockTest.php
index 4c8141073fe0..f118dee3c045 100644
--- a/InventoryCatalog/Test/Integration/CompositeProductReindexOnNonDefaultStockTest.php
+++ b/InventoryCatalog/Test/Integration/CompositeProductReindexOnNonDefaultStockTest.php
@@ -15,6 +15,7 @@
 use Magento\ConfigurableProduct\Test\Fixture\Attribute as AttributeFixture;
 use Magento\ConfigurableProduct\Test\Fixture\Product as ConfigurableProductFixture;
 use Magento\GroupedProduct\Test\Fixture\Product as GroupedProductFixture;
+use Magento\Indexer\Test\Fixture\Indexer as IndexerFixture;
 use Magento\InventoryApi\Test\Fixture\Source as SourceFixture;
 use Magento\InventoryApi\Test\Fixture\SourceItems as SourceItemsFixture;
 use Magento\InventoryApi\Test\Fixture\Stock as StockFixture;
@@ -22,9 +23,13 @@
 use Magento\InventoryIndexer\Model\ResourceModel\GetStockItemData;
 use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
 use Magento\InventorySalesApi\Test\Fixture\StockSalesChannels as StockSalesChannelsFixture;
+use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Store\Test\Fixture\Website as WebsiteFixture;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Fixture\ScopeFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -56,7 +61,11 @@ protected function setUp(): void
 
     #[
         DbIsolation(false),
-        DataFixture(SourceFixture::class, as: 'source'),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        DataFixture(SourceFixture::class, ['source_code' => 'source_bundle'], 'source'),
         DataFixture(StockFixture::class, as: 'stock'),
         DataFixture(
             StockSourceLinksFixture::class,
@@ -64,9 +73,13 @@ protected function setUp(): void
         ),
         DataFixture(
             StockSalesChannelsFixture::class,
-            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['base']]
+            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['$website2.code$']]
+        ),
+        DataFixture(
+            ProductFixture::class,
+            ['sku' => 'child-bundle', 'website_ids' => ['1', '$website2.id$']],
+            'child'
         ),
-        DataFixture(ProductFixture::class, as: 'child'),
         DataFixture(
             SourceItemsFixture::class,
             [['sku' => '$child.sku$', 'source_code' => '$source.source_code$', 'quantity' => 10, 'status' => 1]]
@@ -75,7 +88,12 @@ protected function setUp(): void
         DataFixture(BundleOptionFixture::class, ['product_links' => ['$link$'], 'required' => true], 'opt'),
         DataFixture(
             BundleProductFixture::class,
-            ['_options' => ['$opt$'], 'shipment_type' => 1],
+            [
+                'sku' => 'bundle-parent',
+                'website_ids' => ['1', '$website2.id$'],
+                '_options' => ['$opt$'],
+                'shipment_type' => 1,
+            ],
             'parent_product'
         ),
     ]
@@ -86,7 +104,11 @@ public function testShouldReindexBundleProductStockStatusAfterSave(): void
 
     #[
         DbIsolation(false),
-        DataFixture(SourceFixture::class, as: 'source'),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        DataFixture(SourceFixture::class, ['source_code' => 'source_grouped'], 'source'),
         DataFixture(StockFixture::class, as: 'stock'),
         DataFixture(
             StockSourceLinksFixture::class,
@@ -106,6 +128,7 @@ public function testShouldReindexBundleProductStockStatusAfterSave(): void
             ['product_links' => ['$child.sku$']],
             'parent_product'
         ),
+        DataFixture(IndexerFixture::class),
     ]
     public function testShouldReindexGroupedProductStockStatusAfterSave(): void
     {
@@ -114,7 +137,11 @@ public function testShouldReindexGroupedProductStockStatusAfterSave(): void
 
     #[
         DbIsolation(false),
-        DataFixture(SourceFixture::class, as: 'source'),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        DataFixture(SourceFixture::class, ['source_code' => 'source_configurable'], 'source'),
         DataFixture(StockFixture::class, as: 'stock'),
         DataFixture(
             StockSourceLinksFixture::class,
@@ -135,6 +162,7 @@ public function testShouldReindexGroupedProductStockStatusAfterSave(): void
             ['_options' => ['$attr$'],'_links' => ['$child$']],
             'parent_product'
         ),
+        DataFixture(IndexerFixture::class),
     ]
     public function testShouldReindexConfigurableProductStockStatusAfterSave(): void
     {
diff --git a/InventoryCatalog/Test/Unit/Model/GetStockIdForCurrentWebsiteTest.php b/InventoryCatalog/Test/Unit/Model/GetStockIdForCurrentWebsiteTest.php
index 35f4c0496453..d5b2b5d4ea95 100644
--- a/InventoryCatalog/Test/Unit/Model/GetStockIdForCurrentWebsiteTest.php
+++ b/InventoryCatalog/Test/Unit/Model/GetStockIdForCurrentWebsiteTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\InventoryCatalog\Test\Unit\Model;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Magento\InventoryApi\Api\Data\StockInterface;
 use Magento\InventoryCatalog\Model\GetStockIdForCurrentWebsite;
@@ -95,4 +96,52 @@ public function testExecute(): void
 
         $this->assertSame($stockId, $this->model->execute());
     }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithInvalidStoreFallsBackToCurrentStore(): void
+    {
+        $invalidStoreCode = 'noneExistent';
+        $websiteId = 1;
+        $websiteCode = 'base';
+        $stockId = 1;
+
+        $this->request->expects($this->once())->method('getParam')
+            ->with('store')
+            ->willReturn($invalidStoreCode);
+
+        $currentStore = $this->createMock(StoreInterface::class);
+        $currentStore->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+
+        $this->storeManager->expects($this->exactly(2))
+            ->method('getStore')
+            ->willReturnCallback(function ($storeId = null) use ($invalidStoreCode, $currentStore) {
+                if ($storeId === $invalidStoreCode) {
+                    throw new NoSuchEntityException(__('The store that was requested wasn\'t found.'));
+                }
+                return $currentStore;
+            });
+
+        $website = $this->createMock(WebsiteInterface::class);
+        $website->expects($this->once())
+            ->method('getCode')
+            ->willReturn($websiteCode);
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
+
+        $stock = $this->createMock(StockInterface::class);
+        $stock->expects($this->once())->method('getStockId')
+            ->willReturn($stockId);
+        $this->stockResolver->expects($this->once())
+            ->method('execute')
+            ->with(SalesChannelInterface::TYPE_WEBSITE, $websiteCode)
+            ->willReturn($stock);
+
+        $this->assertSame($stockId, $this->model->execute());
+    }
 }
diff --git a/InventoryCatalog/etc/queue_publisher.xml b/InventoryCatalog/etc/queue_publisher.xml
index 745e96ad2b3b..9fd8b24d0e0a 100644
--- a/InventoryCatalog/etc/queue_publisher.xml
+++ b/InventoryCatalog/etc/queue_publisher.xml
@@ -6,9 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="async.V1.inventory.bulk-product-source-assign.POST"  queue="async.operations.all"/>
-    <publisher topic="async.V1.inventory.bulk-product-source-unassign.POST" queue="async.operations.all"/>
-    <publisher topic="async.V1.inventory.bulk-product-source-transfer.POST" queue="async.operations.all"/>
-    <publisher topic="inventory.source.items.cleanup" queue="inventory.source.items.cleanup"/>
-    <publisher topic="inventory.mass.update" queue="inventory.mass.update"/>
+    <publisher topic="async.V1.inventory.bulk-product-source-assign.POST" />
+    <publisher topic="async.V1.inventory.bulk-product-source-unassign.POST" />
+    <publisher topic="async.V1.inventory.bulk-product-source-transfer.POST" />
+    <publisher topic="inventory.source.items.cleanup" />
+    <publisher topic="inventory.mass.update" />
 </config>
diff --git a/InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithVirtualProductInSingleStockModeWithBackordersTest.xml b/InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithVirtualProductInSingleStockModeWithBackordersTest.xml
index 2c4407237187..fee15e89c647 100644
--- a/InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithVirtualProductInSingleStockModeWithBackordersTest.xml
+++ b/InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithVirtualProductInSingleStockModeWithBackordersTest.xml
@@ -60,6 +60,9 @@
             <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose"/>
         </before>
         <after>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createVirtualProduct" stepKey="deleteProduct"/>
diff --git a/InventoryCatalogAdminUi/Test/Mftf/Test/OnlyXleftNotDisplayedForSimpleProductWithMangeStockAsNoOnTestStockAndMainWebsitesTest.xml b/InventoryCatalogAdminUi/Test/Mftf/Test/OnlyXleftNotDisplayedForSimpleProductWithMangeStockAsNoOnTestStockAndMainWebsitesTest.xml
index e7646854c187..64bbfd44eb5e 100644
--- a/InventoryCatalogAdminUi/Test/Mftf/Test/OnlyXleftNotDisplayedForSimpleProductWithMangeStockAsNoOnTestStockAndMainWebsitesTest.xml
+++ b/InventoryCatalogAdminUi/Test/Mftf/Test/OnlyXleftNotDisplayedForSimpleProductWithMangeStockAsNoOnTestStockAndMainWebsitesTest.xml
@@ -52,6 +52,10 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDeletingTheStock">
             <argument name="tags" value=""/>
         </actionGroup>
+        <!--Clear filter product listing grid-->
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+        <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
     </after>
 
     <!-- Step2: Create the Subcategory -->
diff --git a/InventoryConfigurableProduct/Test/Integration/IsProductSalable/IsConfigurableProductSalableOnNonDefaultStockTest.php b/InventoryConfigurableProduct/Test/Integration/IsProductSalable/IsConfigurableProductSalableOnNonDefaultStockTest.php
index 743892c86f7f..ccf0959b2a88 100644
--- a/InventoryConfigurableProduct/Test/Integration/IsProductSalable/IsConfigurableProductSalableOnNonDefaultStockTest.php
+++ b/InventoryConfigurableProduct/Test/Integration/IsProductSalable/IsConfigurableProductSalableOnNonDefaultStockTest.php
@@ -10,17 +10,21 @@
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\ConfigurableProduct\Test\Fixture\Attribute as AttributeFixture;
 use Magento\ConfigurableProduct\Test\Fixture\Product as ConfigurableProductFixture;
-use Magento\Indexer\Test\Fixture\Indexer;
+use Magento\Indexer\Test\Fixture\Indexer as IndexerFixture;
 use Magento\InventoryApi\Test\Fixture\Source as SourceFixture;
 use Magento\InventoryApi\Test\Fixture\SourceItems as SourceItemsFixture;
 use Magento\InventoryApi\Test\Fixture\Stock as StockFixture;
 use Magento\InventoryApi\Test\Fixture\StockSourceLinks as StockSourceLinksFixture;
 use Magento\InventorySalesApi\Api\AreProductsSalableInterface;
 use Magento\InventorySalesApi\Test\Fixture\StockSalesChannels as StockSalesChannelsFixture;
+use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Store\Test\Fixture\Website as WebsiteFixture;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorage;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Fixture\ScopeFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -53,7 +57,11 @@ protected function setUp(): void
 
     #[
         DbIsolation(false),
-        DataFixture(SourceFixture::class, ['source_code' => 'source_1'], 'source1'),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        DataFixture(SourceFixture::class, ['source_code' => 'source_salable'], 'source1'),
         DataFixture(StockFixture::class, as: 'stock'),
         DataFixture(
             StockSourceLinksFixture::class,
@@ -61,15 +69,27 @@ protected function setUp(): void
         ),
         DataFixture(
             StockSalesChannelsFixture::class,
-            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['base']]
+            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['$website2.code$']]
+        ),
+        DataFixture(
+            ProductFixture::class,
+            ['sku' => 'child-salable-1', 'website_ids' => ['1', '$website2.id$']],
+            'child1'
+        ),
+        DataFixture(
+            ProductFixture::class,
+            ['sku' => 'child-salable-2', 'website_ids' => ['1', '$website2.id$']],
+            'child2'
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
-        DataFixture(ProductFixture::class, ['sku' => 'child-1'], 'child1'),
-        DataFixture(ProductFixture::class, ['sku' => 'child-2'], 'child2'),
         DataFixture(AttributeFixture::class, as: 'attr'),
         DataFixture(
             ConfigurableProductFixture::class,
-            ['_options' => ['$attr$'], '_links' => ['$child1$', '$child2$']],
+            [
+                'sku' => 'configurable-salable',
+                'website_ids' => ['1', '$website2.id$'],
+                '_options' => ['$attr$'],
+                '_links' => ['$child1$', '$child2$'],
+            ],
             'configurable'
         ),
         DataFixture(
@@ -79,7 +99,7 @@ protected function setUp(): void
                 ['sku' => '$child2.sku$', 'source_code' => '$source1.source_code$', 'quantity' => 100, 'status' => 1],
             ]
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
+        DataFixture(IndexerFixture::class),
     ]
     public function testConfigurableIsSalableWhenChildrenAreInStock(): void
     {
@@ -94,7 +114,11 @@ public function testConfigurableIsSalableWhenChildrenAreInStock(): void
 
     #[
         DbIsolation(false),
-        DataFixture(SourceFixture::class, ['source_code' => 'source_1'], 'source1'),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
+        DataFixture(SourceFixture::class, ['source_code' => 'source_oos'], 'source1'),
         DataFixture(StockFixture::class, as: 'stock'),
         DataFixture(
             StockSourceLinksFixture::class,
@@ -102,15 +126,19 @@ public function testConfigurableIsSalableWhenChildrenAreInStock(): void
         ),
         DataFixture(
             StockSalesChannelsFixture::class,
-            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['base']]
+            ['stock_id' => '$stock.stock_id$', 'sales_channels' => ['$website2.code$']]
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
-        DataFixture(ProductFixture::class, ['sku' => 'child-1'], 'child1'),
-        DataFixture(ProductFixture::class, ['sku' => 'child-2'], 'child2'),
+        DataFixture(ProductFixture::class, ['sku' => 'child-oos-1', 'website_ids' => ['1', '$website2.id$']], 'child1'),
+        DataFixture(ProductFixture::class, ['sku' => 'child-oos-2', 'website_ids' => ['1', '$website2.id$']], 'child2'),
         DataFixture(AttributeFixture::class, as: 'attr'),
         DataFixture(
             ConfigurableProductFixture::class,
-            ['_options' => ['$attr$'], '_links' => ['$child1$', '$child2$']],
+            [
+                'sku' => 'configurable-oos',
+                'website_ids' => ['1', '$website2.id$'],
+                '_options' => ['$attr$'],
+                '_links' => ['$child1$', '$child2$'],
+            ],
             'configurable'
         ),
         DataFixture(
@@ -120,7 +148,7 @@ public function testConfigurableIsSalableWhenChildrenAreInStock(): void
                 ['sku' => '$child2.sku$', 'source_code' => '$source1.source_code$', 'quantity' => 0, 'status' => 0],
             ]
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
+        DataFixture(IndexerFixture::class),
     ]
     public function testConfigurableIsNotSalableWhenAllChildrenOutOfStock(): void
     {
@@ -138,6 +166,10 @@ public function testConfigurableIsNotSalableWhenAllChildrenOutOfStock(): void
 
     #[
         DbIsolation(false),
+        DataFixture(ScopeFixture::class, ['type' => 'website', 'code' => 'base'], as: 'website1'),
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$group2.id$'], 'store2'),
         DataFixture(SourceFixture::class, ['source_code' => 'source_us'], 'sourceUs'),
         DataFixture(SourceFixture::class, ['source_code' => 'source_eu'], 'sourceEu'),
         DataFixture(StockFixture::class, as: 'stockUs'),
@@ -151,15 +183,27 @@ public function testConfigurableIsNotSalableWhenAllChildrenOutOfStock(): void
         ),
         DataFixture(
             StockSalesChannelsFixture::class,
-            ['stock_id' => '$stockUs.stock_id$', 'sales_channels' => ['base']]
+            ['stock_id' => '$stockUs.stock_id$', 'sales_channels' => ['$website2.code$']]
+        ),
+        DataFixture(
+            ProductFixture::class,
+            ['sku' => 'child-per-stock-1', 'website_ids' => ['1', '$website2.id$']],
+            'child1'
+        ),
+        DataFixture(
+            ProductFixture::class,
+            ['sku' => 'child-per-stock-2', 'website_ids' => ['1', '$website2.id$']],
+            'child2'
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
-        DataFixture(ProductFixture::class, ['sku' => 'child-1'], 'child1'),
-        DataFixture(ProductFixture::class, ['sku' => 'child-2'], 'child2'),
         DataFixture(AttributeFixture::class, as: 'attr'),
         DataFixture(
             ConfigurableProductFixture::class,
-            ['_options' => ['$attr$'], '_links' => ['$child1$', '$child2$']],
+            [
+                'sku' => 'configurable-per-stock',
+                'website_ids' => ['1', '$website2.id$'],
+                '_options' => ['$attr$'],
+                '_links' => ['$child1$', '$child2$'],
+            ],
             'configurable'
         ),
         DataFixture(
@@ -171,7 +215,7 @@ public function testConfigurableIsNotSalableWhenAllChildrenOutOfStock(): void
                 ['sku' => '$child2.sku$', 'source_code' => '$sourceEu.source_code$', 'quantity' => 0, 'status' => 0],
             ]
         ),
-        DataFixture(Indexer::class, ['indexer_id' => 'inventory']),
+        DataFixture(IndexerFixture::class),
     ]
     public function testConfigurableSalabilityReflectsPerStockSourceAssignments(): void
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductOnlyXLeftInStockTest.php b/InventoryGraphQl/Test/Api/GraphQl/BundleProductOnlyXLeftInStockTest.php
similarity index 95%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductOnlyXLeftInStockTest.php
rename to InventoryGraphQl/Test/Api/GraphQl/BundleProductOnlyXLeftInStockTest.php
index 7c0dbe4456d3..27f5d92b4795 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductOnlyXLeftInStockTest.php
+++ b/InventoryGraphQl/Test/Api/GraphQl/BundleProductOnlyXLeftInStockTest.php
@@ -5,8 +5,9 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Inventory;
+namespace Magento\InventoryGraphQl\Test\Api\GraphQl;
 
+use Exception;
 use Magento\Bundle\Test\Fixture\AddProductToCart as AddBundleProductToCart;
 use Magento\Bundle\Test\Fixture\Link as BundleSelectionFixture;
 use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
@@ -25,6 +26,8 @@
 
 /**
  * Test for bundle product only x left in stock
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BundleProductOnlyXLeftInStockTest extends GraphQlAbstract
 {
@@ -39,7 +42,7 @@ class BundleProductOnlyXLeftInStockTest extends GraphQlAbstract
     private $fixtures;
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function setUp(): void
     {
@@ -80,7 +83,7 @@ protected function setUp(): void
      * @param string $stockThresholdQty
      * @return void
      *
-     * @throws \Exception
+     * @throws Exception
      */
     #[DataProvider('stockThresholdQtyProvider')]
     public function testOnlyXLeftInStockBundleProduct(string $stockThresholdQty): void
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductStockStatusTest.php b/InventoryGraphQl/Test/Api/GraphQl/BundleProductStockStatusTest.php
similarity index 98%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductStockStatusTest.php
rename to InventoryGraphQl/Test/Api/GraphQl/BundleProductStockStatusTest.php
index a1da356e6196..1708ad70c660 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/BundleProductStockStatusTest.php
+++ b/InventoryGraphQl/Test/Api/GraphQl/BundleProductStockStatusTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Inventory;
+namespace Magento\InventoryGraphQl\Test\Api\GraphQl;
 
 use Magento\Bundle\Test\Fixture\AddProductToCart as AddBundleProductToCart;
 use Magento\Bundle\Test\Fixture\Link as BundleSelectionFixture;
@@ -33,6 +33,8 @@
 
 /**
  * Test for bundle product stock_status
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BundleProductStockStatusTest extends GraphQlAbstract
 {
@@ -47,7 +49,7 @@ class BundleProductStockStatusTest extends GraphQlAbstract
     private $fixtures;
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function setUp(): void
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/SimpleProductWithOptionsCartTest.php b/InventoryGraphQl/Test/Api/GraphQl/SimpleProductWithOptionsCartTest.php
similarity index 99%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/SimpleProductWithOptionsCartTest.php
rename to InventoryGraphQl/Test/Api/GraphQl/SimpleProductWithOptionsCartTest.php
index dbc903b4ab28..5bdb3b894ec4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Inventory/SimpleProductWithOptionsCartTest.php
+++ b/InventoryGraphQl/Test/Api/GraphQl/SimpleProductWithOptionsCartTest.php
@@ -5,11 +5,12 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Inventory;
+namespace Magento\InventoryGraphQl\Test\Api\GraphQl;
 
 use Exception;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Test\Fixture\Product;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\DataObject;
@@ -21,7 +22,6 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Product stock_status test
diff --git a/InventoryGroupedProduct/Test/Mftf/Test/StockStatusChangedForGroupedProductOnTestStockTest.xml b/InventoryGroupedProduct/Test/Mftf/Test/StockStatusChangedForGroupedProductOnTestStockTest.xml
index 22c92db4b742..274a0b935ca6 100644
--- a/InventoryGroupedProduct/Test/Mftf/Test/StockStatusChangedForGroupedProductOnTestStockTest.xml
+++ b/InventoryGroupedProduct/Test/Mftf/Test/StockStatusChangedForGroupedProductOnTestStockTest.xml
@@ -58,6 +58,9 @@
             <!--Disable all sources.-->
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="deleteSource"/>
             <!--Admin logout-->
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
         <!-- Assign Test source to simple and virtual products -->
diff --git a/InventoryGroupedProduct/Test/Mftf/test-dependency-allowlist b/InventoryGroupedProduct/Test/Mftf/test-dependency-allowlist
index f747a64e61f2..984359560d33 100644
--- a/InventoryGroupedProduct/Test/Mftf/test-dependency-allowlist
+++ b/InventoryGroupedProduct/Test/Mftf/test-dependency-allowlist
@@ -7,3 +7,5 @@ _defaultSource
 AdminProductSourcesGrid
 UnassignSourceFromProductActionGroup
 CliConsumerStartActionGroup
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/InventoryGroupedProductIndexer/Indexer/SiblingProductsProvider.php b/InventoryGroupedProductIndexer/Indexer/SiblingProductsProvider.php
index f88abb479d93..378c1d03f93f 100644
--- a/InventoryGroupedProductIndexer/Indexer/SiblingProductsProvider.php
+++ b/InventoryGroupedProductIndexer/Indexer/SiblingProductsProvider.php
@@ -8,6 +8,7 @@
 namespace Magento\InventoryGroupedProductIndexer\Indexer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\InventoryIndexer\Indexer\SiblingProductsProviderInterface;
@@ -29,6 +30,7 @@ public function __construct(
      */
     public function getSkus(array $skus): array
     {
+        $linkTypeId = Link::LINK_TYPE_GROUPED;
         $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
         $connection = $this->resourceConnection->getConnection();
@@ -38,7 +40,8 @@ public function getSkus(array $skus): array
                 []
             )->joinInner(
                 ['sibling_link' => $this->resourceConnection->getTableName('catalog_product_link')],
-                'sibling_link.linked_product_id = child_product_entity.' . $metadata->getIdentifierField(),
+                'sibling_link.linked_product_id = child_product_entity.' . $metadata->getIdentifierField()
+                . ' AND sibling_link.link_type_id = ' . $linkTypeId,
                 []
             )->joinInner(
                 ['sibling_product_entity' => $this->resourceConnection->getTableName('catalog_product_entity')],
diff --git a/InventoryInStorePickup/Model/ExtractPickupLocationAddressData.php b/InventoryInStorePickup/Model/ExtractPickupLocationAddressData.php
index 95e15d3d96d4..2e30203abc34 100644
--- a/InventoryInStorePickup/Model/ExtractPickupLocationAddressData.php
+++ b/InventoryInStorePickup/Model/ExtractPickupLocationAddressData.php
@@ -8,6 +8,7 @@
 namespace Magento\InventoryInStorePickup\Model;
 
 use Magento\Directory\Model\RegionFactory;
+use Magento\Directory\Model\ResourceModel\Region as RegionResource;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\Copy;
 use Magento\InventoryApi\Api\Data\SourceInterface;
@@ -28,6 +29,11 @@ class ExtractPickupLocationAddressData
      */
     private $regionFactory;
 
+    /**
+     * @var RegionResource
+     */
+    private $regionResource;
+
     /**
      * @var array
      */
@@ -36,14 +42,18 @@ class ExtractPickupLocationAddressData
     /**
      * @param Copy $copyService
      * @param RegionFactory|null $regionFactory
+     * @param RegionResource|null $regionResource
      */
     public function __construct(
         Copy $copyService,
-        ?RegionFactory $regionFactory = null
+        ?RegionFactory $regionFactory = null,
+        ?RegionResource $regionResource = null
     ) {
         $this->objectCopyService = $copyService;
         $this->regionFactory = $regionFactory ?:
             ObjectManager::getInstance()->get(RegionFactory::class);
+        $this->regionResource = $regionResource ?:
+            ObjectManager::getInstance()->get(RegionResource::class);
     }
 
     /**
@@ -78,7 +88,11 @@ private function retrieveRegion(PickupLocationInterface $pickupLocation, array $
 
         if (!isset($this->regions[$cacheKey])) {
             $region = $this->regionFactory->create();
-            $region->loadByName($pickupLocation->getRegion(), $pickupLocation->getCountryId());
+            if ($pickupLocation->getRegionId()) {
+                $this->regionResource->load($region, $pickupLocation->getRegionId());
+            } else {
+                $region->loadByName($pickupLocation->getRegion(), $pickupLocation->getCountryId());
+            }
             $this->regions[$cacheKey] = $region->getName() ?: $pickupLocation->getRegion();
         }
 
diff --git a/InventoryInStorePickup/Test/Unit/Model/ExtractPickupLocationAddressDataTest.php b/InventoryInStorePickup/Test/Unit/Model/ExtractPickupLocationAddressDataTest.php
index 50a37b56b2c5..f47c48ac9ca8 100644
--- a/InventoryInStorePickup/Test/Unit/Model/ExtractPickupLocationAddressDataTest.php
+++ b/InventoryInStorePickup/Test/Unit/Model/ExtractPickupLocationAddressDataTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Directory\Model\Region;
 use Magento\Directory\Model\RegionFactory;
+use Magento\Directory\Model\ResourceModel\Region as RegionResource;
 use Magento\Framework\DataObject\Copy;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -40,6 +41,11 @@ class ExtractPickupLocationAddressDataTest extends TestCase
      */
     private $regionMock;
 
+    /**
+     * @var RegionResource|MockObject
+     */
+    private $regionResourceMock;
+
     /**
      * @inheritDoc
      */
@@ -49,10 +55,16 @@ protected function setUp(): void
 
         $this->regionMock = $this->createPartialMockWithReflection(
             Region::class,
-            ['getCode', 'load', 'getName', 'loadByName']
+            ['getCode', 'getName', 'loadByName']
         );
         $this->regionMock->method('loadByName')->willReturnSelf();
 
+        $this->regionResourceMock = $this->getMockBuilder(RegionResource::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['load'])
+            ->getMock();
+        $this->regionResourceMock->method('load')->willReturnSelf();
+
         $this->objectCopyServiceMock = $this->getMockBuilder(Copy::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getDataFromFieldset'])
@@ -71,6 +83,7 @@ protected function setUp(): void
             [
                 'objectCopyService' => $this->objectCopyServiceMock,
                 'regionFactory' => $regionFactoryMock,
+                'regionResource' => $this->regionResourceMock,
             ]
         );
     }
@@ -120,4 +133,81 @@ public static function executeDataProvider(): array
             ],
         ];
     }
+
+    /**
+     * When region_id is set, region is loaded via ResourceModel by ID and loadByName is not called.
+     */
+    public function testExecuteLoadsRegionByIdWhenRegionIdIsSet(): void
+    {
+        $this->objectCopyServiceMock->method('getDataFromFieldset')
+            ->willReturn(['region' => 'stale_name']);
+        $this->regionMock->method('getName')->willReturn('current_name');
+
+        $pickupLocation = $this->createMock(PickupLocation::class);
+        $pickupLocation->method('getCountryId')->willReturn('CH');
+        $pickupLocation->method('getRegionId')->willReturn(42);
+        $pickupLocation->method('getRegion')->willReturn('stale_name');
+
+        $this->regionResourceMock->expects($this->once())
+            ->method('load')
+            ->with($this->regionMock, 42);
+        $this->regionMock->expects($this->never())->method('loadByName');
+
+        $result = $this->model->execute($pickupLocation);
+
+        $this->assertEquals(['region' => 'current_name'], $result);
+    }
+
+    /**
+     * When region_id is null, region is resolved via loadByName and ResourceModel load is not called.
+     */
+    public function testExecuteFallsBackToLoadByNameWhenRegionIdIsNull(): void
+    {
+        $this->objectCopyServiceMock->method('getDataFromFieldset')
+            ->willReturn(['region' => 'some_region']);
+        $this->regionMock->method('getName')->willReturn('some_region');
+
+        $pickupLocation = $this->createMock(PickupLocation::class);
+        $pickupLocation->method('getCountryId')->willReturn('US');
+        $pickupLocation->method('getRegionId')->willReturn(null);
+        $pickupLocation->method('getRegion')->willReturn('some_region');
+
+        $this->regionResourceMock->expects($this->never())->method('load');
+        $this->regionMock->expects($this->once())
+            ->method('loadByName')
+            ->with('some_region', 'US')
+            ->willReturnSelf();
+
+        $result = $this->model->execute($pickupLocation);
+
+        $this->assertEquals(['region' => 'some_region'], $result);
+    }
+
+    /**
+     * After a Directory data patch renames a subdivision, the current name is resolved
+     * live from Directory by region_id, not from the stale string in inventory_source.region.
+     */
+    public function testExecuteReturnsCurrentRegionNameAfterDirectoryRename(): void
+    {
+        // inventory_source.region still holds the old name from before the data patch
+        $this->objectCopyServiceMock->method('getDataFromFieldset')
+            ->willReturn(['region' => 'Friburg']);
+
+        // ResourceModel returns the updated name after the rename
+        $this->regionMock->method('getName')->willReturn('Renamed Friburg');
+
+        $pickupLocation = $this->createMock(PickupLocation::class);
+        $pickupLocation->method('getCountryId')->willReturn('CH');
+        $pickupLocation->method('getRegionId')->willReturn(42);
+        $pickupLocation->method('getRegion')->willReturn('Friburg');
+
+        $this->regionResourceMock->expects($this->once())
+            ->method('load')
+            ->with($this->regionMock, 42);
+
+        $result = $this->model->execute($pickupLocation);
+
+        // Must reflect the live Directory name, not the stale inventory_source value
+        $this->assertEquals(['region' => 'Renamed Friburg'], $result);
+    }
 }
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateInvoiceWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateInvoiceWithSimpleProductCustomStockTest.xml
index 0d5946c89345..41e8eb7ed38f 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateInvoiceWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateInvoiceWithSimpleProductCustomStockTest.xml
@@ -79,6 +79,8 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateShipmentWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateShipmentWithSimpleProductCustomStockTest.xml
index 281b0810f8d8..e7eb4bbf49b6 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateShipmentWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminCreateShipmentWithSimpleProductCustomStockTest.xml
@@ -79,6 +79,8 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="clearProductGridFilters"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderBundleProductTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderBundleProductTest.xml
index 69c922467964..f2c50dedfeb4 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderBundleProductTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderBundleProductTest.xml
@@ -97,6 +97,7 @@
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
                 <argument name="tags" value=""/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!--Add bundle product to cart.-->
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderConfigurableProductTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderConfigurableProductTest.xml
index 8c31fdf01e7a..89ba91cd5c81 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderConfigurableProductTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderConfigurableProductTest.xml
@@ -95,6 +95,7 @@
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!--Add configurable product to cart.-->
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderGroupedProductTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderGroupedProductTest.xml
index 8348cbdfd63e..8eac4c666a46 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderGroupedProductTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyCustomerForPickupOrderGroupedProductTest.xml
@@ -78,6 +78,7 @@
             </actionGroup>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyOrderIsReadyForPickupTwiceWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyOrderIsReadyForPickupTwiceWithSimpleProductCustomStockTest.xml
index ec43b505b382..7f40ba74339f 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyOrderIsReadyForPickupTwiceWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminNotifyOrderIsReadyForPickupTwiceWithSimpleProductCustomStockTest.xml
@@ -69,6 +69,7 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminVerifyNotifyOrderIsReadyForPickupWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminVerifyNotifyOrderIsReadyForPickupWithSimpleProductCustomStockTest.xml
index f69300bc8f86..a0393c8ac5fd 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminVerifyNotifyOrderIsReadyForPickupWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/Test/AdminVerifyNotifyOrderIsReadyForPickupWithSimpleProductCustomStockTest.xml
@@ -71,6 +71,7 @@
             </actionGroup>
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventoryInStorePickupAdminUi/Test/Mftf/test-dependency-allowlist b/InventoryInStorePickupAdminUi/Test/Mftf/test-dependency-allowlist
index d5706583d157..44a15c4de182 100644
--- a/InventoryInStorePickupAdminUi/Test/Mftf/test-dependency-allowlist
+++ b/InventoryInStorePickupAdminUi/Test/Mftf/test-dependency-allowlist
@@ -8,4 +8,5 @@ StorefrontAddConfigurableProductToTheCartActionGroup
 AdminProductFormGroupedProductsSection
 AdminAddProductsToGroupPanel
 FillDefaultQuantityForLinkedToGroupProductInGridActionGroup
-AdminSelectInStorePickupShippingMethodActionGroup
\ No newline at end of file
+AdminSelectInStorePickupShippingMethodActionGroup
+AdminOrdersGridClearFiltersActionGroup
\ No newline at end of file
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
index d3905ebbf0b8..0a99d2123adf 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
@@ -92,6 +92,7 @@
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!--Go to storefront -->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/LoggedInCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/LoggedInCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
index dd787eac294b..31acffd3eebe 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/LoggedInCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/LoggedInCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml
@@ -61,6 +61,7 @@
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutStorefront"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithBundleProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithBundleProductCustomStockTest.xml
index 21f02afbcc8c..3b48d0335de7 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithBundleProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithBundleProductCustomStockTest.xml
@@ -77,6 +77,7 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithConfigurableProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithConfigurableProductCustomStockTest.xml
index 8c87018012b4..34ce4a76b589 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithConfigurableProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithConfigurableProductCustomStockTest.xml
@@ -78,6 +78,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithGroupedProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithGroupedProductCustomStockTest.xml
index 561527af12c7..dd6083692856 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithGroupedProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithGroupedProductCustomStockTest.xml
@@ -65,6 +65,7 @@
 
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
index d094d2d028d5..464f4b8e1898 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
@@ -92,6 +92,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Disable 'add store code to url'-->
             <magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockTest.xml
index a4ea4aabe383..967a0c165a6c 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductCustomStockTest.xml
@@ -64,6 +64,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductNumericSourceTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductNumericSourceTest.xml
index 7876826c4bd7..0dd152aca3b0 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductNumericSourceTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontGuestCreateOrderWithSimpleProductNumericSourceTest.xml
@@ -56,6 +56,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
index 056d0034be53..40bf01973cae 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockCustomWebsiteTest.xml
@@ -89,6 +89,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Disable 'add store code to url'-->
             <magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
diff --git a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockTest.xml b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockTest.xml
index 246256aa0a12..d9b25595c386 100644
--- a/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockTest.xml
+++ b/InventoryInStorePickupFrontend/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderWithSimpleProductCustomStockTest.xml
@@ -64,6 +64,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter" before="logoutOfAdmin"/>
             <!--Revert Distance Provider for Distance Based SSA to online.-->
             <magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
             <!--Disable 'In Store Pickup' shipping method.-->
diff --git a/InventoryInStorePickupQuote/Plugin/Checkout/ShippingInformationManagementPlugin.php b/InventoryInStorePickupQuote/Plugin/Checkout/ShippingInformationManagementPlugin.php
index 50ed793153e1..1d9f06729006 100644
--- a/InventoryInStorePickupQuote/Plugin/Checkout/ShippingInformationManagementPlugin.php
+++ b/InventoryInStorePickupQuote/Plugin/Checkout/ShippingInformationManagementPlugin.php
@@ -33,7 +33,10 @@ public function beforeSaveAddressInformation(
         $address = $addressInformation->getShippingAddress();
         $billingAddress = $addressInformation->getBillingAddress();
 
-        if (!$this->isPickupStoreShipping($address) && $this->isBillingAddressCompletelyNull($billingAddress)) {
+        if (!$this->isPickupStoreShipping($address)
+            && $this->isBillingAddressCompletelyNull($billingAddress)
+            && $this->hasCompleteShippingAddress($address)
+        ) {
             $addressInformation->setBillingAddress($address);
         }
 
@@ -58,6 +61,24 @@ private function isPickupStoreShipping(?AddressInterface $shippingAddress): bool
         return false;
     }
 
+    /**
+     * Check if shipping address has enough data to be copied to billing.
+     *
+     * @param AddressInterface|null $shippingAddress
+     * @return bool
+     */
+    private function hasCompleteShippingAddress(?AddressInterface $shippingAddress): bool
+    {
+        if (!$shippingAddress) {
+            return false;
+        }
+        $street = $shippingAddress->getStreet();
+        if (is_array($street)) {
+            $street = implode('', $street);
+        }
+        return $street && $shippingAddress->getCity();
+    }
+
     /**
      * Check if billing address is completely null (not set at all)
      *
diff --git a/InventoryInStorePickupQuote/Test/Unit/Plugin/Checkout/ShippingInformationManagementPluginTest.php b/InventoryInStorePickupQuote/Test/Unit/Plugin/Checkout/ShippingInformationManagementPluginTest.php
index 91721d1d491a..a2aee9fb548c 100644
--- a/InventoryInStorePickupQuote/Test/Unit/Plugin/Checkout/ShippingInformationManagementPluginTest.php
+++ b/InventoryInStorePickupQuote/Test/Unit/Plugin/Checkout/ShippingInformationManagementPluginTest.php
@@ -145,6 +145,8 @@ public function testBeforeSaveAddressInformationNotPickupStore(): void
         $this->extensionAttributes->expects($this->once())
             ->method('getPickupLocationCode')
             ->willReturn(null);
+        $this->shippingAddress->expects($this->once())->method('getStreet')->willReturn(['123 Main St']);
+        $this->shippingAddress->expects($this->once())->method('getCity')->willReturn('Austin');
         $this->addressInformation->expects($this->once())
             ->method('getShippingAddress')
             ->willReturn($this->shippingAddress);
@@ -161,4 +163,35 @@ public function testBeforeSaveAddressInformationNotPickupStore(): void
         );
         $this->assertEquals([$cartId, $this->addressInformation], $result);
     }
+
+    /**
+     * Test billing is not copied when shipping address was cleared after pickup reset
+     *
+     * @return void
+     */
+    public function testBeforeSaveAddressInformationDoesNotCopyIncompleteShippingAddressToBilling(): void
+    {
+        $cartId = 123;
+        $this->shippingAddress->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->extensionAttributes);
+        $this->extensionAttributes->expects($this->once())
+            ->method('getPickupLocationCode')
+            ->willReturn(null);
+        $this->shippingAddress->expects($this->once())->method('getStreet')->willReturn([]);
+        $this->shippingAddress->expects($this->never())->method('getCity');
+        $this->addressInformation->expects($this->once())
+            ->method('getShippingAddress')
+            ->willReturn($this->shippingAddress);
+        $this->addressInformation->expects($this->once())
+            ->method('getBillingAddress')
+            ->willReturn(null);
+        $this->addressInformation->expects($this->never())->method('setBillingAddress');
+        $result = $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+        $this->assertEquals([$cartId, $this->addressInformation], $result);
+    }
 }
diff --git a/InventoryInStorePickupQuoteGraphQl/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPlugin.php b/InventoryInStorePickupQuoteGraphQl/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPlugin.php
new file mode 100644
index 000000000000..d7c6010a7266
--- /dev/null
+++ b/InventoryInStorePickupQuoteGraphQl/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPlugin.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryInStorePickupQuoteGraphQl\Plugin\Checkout;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Model\ShippingInformationManagement;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\InventoryInStorePickupShippingApi\Model\Carrier\InStorePickup;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressExtensionFactory;
+use Magento\Quote\Api\Data\AddressInterface;
+
+/**
+ * Clear pickup location data from quote shipping address when switching to a non-pickup delivery method.
+ */
+class ClearPickupLocationOnNonPickupShippingMethodPlugin
+{
+    /**
+     * @param AddressExtensionFactory $addressExtensionFactory
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        private readonly AddressExtensionFactory $addressExtensionFactory,
+        private readonly CartRepositoryInterface $cartRepository
+    ) {
+    }
+
+    /**
+     * Remove pickup location association before shipping information is saved for a delivery method.
+     *
+     * @param ShippingInformationManagement $subject
+     * @param int $cartId
+     * @param ShippingInformationInterface $addressInformation
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws NoSuchEntityException
+     */
+    public function beforeSaveAddressInformation(
+        ShippingInformationManagement $subject,
+        int $cartId,
+        ShippingInformationInterface $addressInformation
+    ): array {
+        if ($this->shouldSkipForShippingMethod($addressInformation)) {
+            return [$cartId, $addressInformation];
+        }
+        $shippingAddress = $addressInformation->getShippingAddress();
+        $quoteShippingAddress = $this->cartRepository->getActive($cartId)->getShippingAddress();
+        $quoteIsInStorePickup = $this->isQuoteInStorePickupOrder($quoteShippingAddress);
+        if ($this->shouldPreservePickupAssignment($quoteIsInStorePickup, $shippingAddress)) {
+            return [$cartId, $addressInformation];
+        }
+        $this->cleanupPickupFromAddresses($shippingAddress, $quoteShippingAddress, $quoteIsInStorePickup);
+        return [$cartId, $addressInformation];
+    }
+
+    /**
+     * Skip cleanup when shipping method is missing or already in-store pickup.
+     *
+     * @param ShippingInformationInterface $addressInformation
+     * @return bool
+     */
+    private function shouldSkipForShippingMethod(ShippingInformationInterface $addressInformation): bool
+    {
+        $carrierCode = $addressInformation->getShippingCarrierCode();
+        $methodCode = $addressInformation->getShippingMethodCode();
+        if ($carrierCode === null || $methodCode === null) {
+            return true;
+        }
+        return $carrierCode . '_' . $methodCode === InStorePickup::DELIVERY_METHOD;
+    }
+
+    /**
+     * Skip cleanup when the request is establishing pickup on a non-pickup quote.
+     *
+     * @param bool $quoteIsInStorePickup
+     * @param AddressInterface|null $shippingAddress
+     * @return bool
+     */
+    private function shouldPreservePickupAssignment(
+        bool $quoteIsInStorePickup,
+        ?AddressInterface $shippingAddress
+    ): bool {
+        return !$quoteIsInStorePickup && $this->hasPickupLocationCode($shippingAddress);
+    }
+
+    /**
+     * Clear pickup association and optionally reset store address fields.
+     *
+     * @param AddressInterface|null $shippingAddress
+     * @param AddressInterface|null $quoteShippingAddress
+     * @param bool $quoteIsInStorePickup
+     * @return void
+     */
+    private function cleanupPickupFromAddresses(
+        ?AddressInterface $shippingAddress,
+        ?AddressInterface $quoteShippingAddress,
+        bool $quoteIsInStorePickup
+    ): void {
+        $this->clearPickupLocationFromAddress($shippingAddress);
+        if ($this->isDistinctQuoteAddress($quoteShippingAddress, $shippingAddress)) {
+            $this->clearPickupLocationFromAddress($quoteShippingAddress);
+        }
+
+        if (!$quoteIsInStorePickup) {
+            return;
+        }
+
+        $this->resetInStorePickupAddress($shippingAddress);
+        if ($this->isDistinctQuoteAddress($quoteShippingAddress, $shippingAddress)) {
+            $this->resetInStorePickupAddress($quoteShippingAddress);
+        }
+    }
+
+    /**
+     * Check whether quote shipping address is a different object from the incoming address.
+     *
+     * @param AddressInterface|null $quoteShippingAddress
+     * @param AddressInterface|null $shippingAddress
+     * @return bool
+     */
+    private function isDistinctQuoteAddress(
+        ?AddressInterface $quoteShippingAddress,
+        ?AddressInterface $shippingAddress
+    ): bool {
+        return $quoteShippingAddress !== null && $quoteShippingAddress !== $shippingAddress;
+    }
+
+    /**
+     * Check whether the cart is currently an in-store pickup order.
+     *
+     * @param AddressInterface|null $quoteShippingAddress
+     * @return bool
+     */
+    private function isQuoteInStorePickupOrder(
+        ?AddressInterface $quoteShippingAddress
+    ): bool {
+        if ($this->hasPickupLocationCode($quoteShippingAddress)) {
+            return true;
+        }
+        return $quoteShippingAddress?->getShippingMethod() === InStorePickup::DELIVERY_METHOD;
+    }
+
+    /**
+     * Check the given address is an in-store pickup address
+     *
+     * @param AddressInterface|null $address
+     * @return bool
+     */
+    private function hasPickupLocationCode(?AddressInterface $address): bool
+    {
+        $pickupLocationCode = $address?->getExtensionAttributes()?->getPickupLocationCode();
+
+        return $pickupLocationCode !== null && $pickupLocationCode !== '';
+    }
+
+    /**
+     * Clear in-store pickup address fields
+     *
+     * @param AddressInterface|null $address
+     * @return void
+     */
+    private function resetInStorePickupAddress(?AddressInterface $address): void
+    {
+        if ($address === null) {
+            return;
+        }
+        $address->setFirstname(null);
+        $address->setLastname(null);
+        $address->setCompany(null);
+        $address->setStreet([]);
+        $address->setCity(null);
+        $address->setRegion(null);
+        $address->setRegionId(null);
+        $address->setRegionCode(null);
+        $address->setPostcode(null);
+        $address->setTelephone(null);
+        $address->setCustomerAddressId(null);
+        $address->setSaveInAddressBook(false);
+        $address->setSameAsBilling(false);
+    }
+
+    /**
+     * Ensure extension attributes exist and clear pickup location code.
+     *
+     * @param AddressInterface|null $address
+     * @return void
+     */
+    private function clearPickupLocationFromAddress(?AddressInterface $address): void
+    {
+        if ($address === null) {
+            return;
+        }
+        $extension = $address->getExtensionAttributes();
+        if ($extension === null) {
+            $extension = $this->addressExtensionFactory->create();
+            $address->setExtensionAttributes($extension);
+        }
+        $extension->setPickupLocationCode(null);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryInStorePickupQuote/PickupLocationForShippingTest.php b/InventoryInStorePickupQuoteGraphQl/Test/Api/GraphQl/PickupLocationForShippingTest.php
similarity index 98%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryInStorePickupQuote/PickupLocationForShippingTest.php
rename to InventoryInStorePickupQuoteGraphQl/Test/Api/GraphQl/PickupLocationForShippingTest.php
index f91b16919e90..456562c46277 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryInStorePickupQuote/PickupLocationForShippingTest.php
+++ b/InventoryInStorePickupQuoteGraphQl/Test/Api/GraphQl/PickupLocationForShippingTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\InventoryInStorePickupQuote;
+namespace Magento\InventoryInStorePickupQuoteGraphQl\Test\Api\GraphQl;
 
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -13,6 +13,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Validation\ValidationException;
 use Magento\InventoryApi\Api\SourceRepositoryInterface;
+use Magento\InventoryApi\Test\Fixture\Source as SourceFixture;
 use Magento\InventoryApi\Test\Fixture\SourceItems as SourceItemsFixture;
 use Magento\InventoryApi\Test\Fixture\Stock as StockFixture;
 use Magento\InventoryApi\Test\Fixture\StockSourceLinks as StockSourceLinksFixture;
@@ -20,7 +21,6 @@
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 use Magento\InventorySalesApi\Test\Fixture\StockSalesChannels as StockSalesChannelsFixture;
 use Magento\Quote\Test\Fixture\AddProductToCart as AddProductToCartFixture;
-use Magento\InventoryApi\Test\Fixture\Source as SourceFixture;
 use Magento\Quote\Test\Fixture\GuestCart as GuestCartFixture;
 use Magento\Quote\Test\Fixture\QuoteIdMask as QuoteMaskFixture;
 use Magento\Store\Model\StoreManagerInterface;
@@ -35,6 +35,8 @@
 /**
  * Test coverage of extension of Quote Graph Ql.
  * Test possibility to pass Pickup Location Code to Shipping Address.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PickupLocationForShippingTest extends GraphQlAbstract
 {
diff --git a/InventoryInStorePickupQuoteGraphQl/Test/Unit/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPluginTest.php b/InventoryInStorePickupQuoteGraphQl/Test/Unit/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPluginTest.php
new file mode 100644
index 000000000000..1189f7e9d9a3
--- /dev/null
+++ b/InventoryInStorePickupQuoteGraphQl/Test/Unit/Plugin/Checkout/ClearPickupLocationOnNonPickupShippingMethodPluginTest.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryInStorePickupQuoteGraphQl\Test\Unit\Plugin\Checkout;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Model\ShippingInformationManagement;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
+use Magento\InventoryInStorePickupQuoteGraphQl\Plugin\Checkout\ClearPickupLocationOnNonPickupShippingMethodPlugin;
+use Magento\InventoryInStorePickupShippingApi\Model\Carrier\InStorePickup;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressExtensionFactory;
+use Magento\Quote\Api\Data\AddressExtensionInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Unit test for ClearPickupLocationOnNonPickupShippingMethodPlugin.
+ */
+class ClearPickupLocationOnNonPickupShippingMethodPluginTest extends TestCase
+{
+    use MockCreationTrait;
+
+    /**
+     * Test subject
+     *
+     * @var ClearPickupLocationOnNonPickupShippingMethodPlugin
+     */
+    private ClearPickupLocationOnNonPickupShippingMethodPlugin $plugin;
+
+    /** @var ShippingInformationManagement|MockObject */
+    private $subject;
+
+    /** @var ShippingInformationInterface|MockObject */
+    private $addressInformation;
+
+    /** @var CartRepositoryInterface|MockObject */
+    private $cartRepository;
+
+    /** @var AddressExtensionFactory|MockObject */
+    private $addressExtensionFactory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->subject = $this->createMock(ShippingInformationManagement::class);
+        $this->addressInformation = $this->createMock(ShippingInformationInterface::class);
+        $this->cartRepository = $this->createMock(CartRepositoryInterface::class);
+        $this->addressExtensionFactory = $this->createMock(AddressExtensionFactory::class);
+        $this->plugin = new ClearPickupLocationOnNonPickupShippingMethodPlugin(
+            $this->addressExtensionFactory,
+            $this->cartRepository
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testDoesNothingWhenMethodIsInStorePickup(): void
+    {
+        $cartId = 42;
+        $this->addressInformation->method('getShippingCarrierCode')->willReturn('instore');
+        $this->addressInformation->method('getShippingMethodCode')->willReturn('pickup');
+        $this->cartRepository->expects($this->never())->method('getActive');
+
+        $result = $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+
+        $this->assertSame([$cartId, $this->addressInformation], $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testDoesNothingWhenCarrierCodeIsNull(): void
+    {
+        $cartId = 42;
+        $this->addressInformation->method('getShippingCarrierCode')->willReturn(null);
+        $this->addressInformation->method('getShippingMethodCode')->willReturn('flatrate');
+        $this->cartRepository->expects($this->never())->method('getActive');
+
+        $result = $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+
+        $this->assertSame([$cartId, $this->addressInformation], $result);
+    }
+
+    /**
+     * The request is establishing in-store pickup (it carries a pickup location) on a cart that is
+     * not yet a pickup order, so the plugin must keep the address even with a placeholder carrier.
+     *
+     * @return void
+     */
+    public function testKeepsPickupStateWhenRequestEstablishesPickupOnNonPickupQuote(): void
+    {
+        $cartId = 42;
+        $incomingExtension = $this->createExtensionMock('apple-store');
+        $incomingAddress = $this->createAddressMock($incomingExtension);
+        $quoteExtension = $this->createExtensionMock(null);
+        $quoteShippingAddress = $this->createAddressMock($quoteExtension);
+        $quoteShippingAddress->method('getShippingMethod')->willReturn(null);
+
+        $incomingExtension->expects($this->never())->method('setPickupLocationCode');
+        $incomingAddress->expects($this->never())->method('setFirstname');
+        $incomingAddress->expects($this->never())->method('setStreet');
+        $incomingAddress->expects($this->never())->method('setCity');
+
+        $this->configureFlatrateMethod();
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getShippingAddress')->willReturn($quoteShippingAddress);
+        $this->cartRepository->method('getActive')->with($cartId)->willReturn($quote);
+        $this->addressInformation->method('getShippingAddress')->willReturn($incomingAddress);
+
+        $result = $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+
+        $this->assertSame([$cartId, $this->addressInformation], $result);
+    }
+
+    /**
+     * Switching an existing in-store pickup order to home delivery must clear the pickup location and
+     * reset the store address even though the reused quote address still carries the pickup code.
+     *
+     * @return void
+     */
+    public function testClearsPickupWhenSwitchingExistingPickupOrderToDelivery(): void
+    {
+        $cartId = 42;
+        $extension = $this->createExtensionMock('apple-store');
+        $shippingAddress = $this->createAddressMock($extension);
+
+        $extension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $this->expectAddressReset($shippingAddress);
+
+        $this->configureFlatrateMethod();
+        $this->configureQuoteWithShippingAddress($cartId, $shippingAddress);
+
+        $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testDoesNotResetAddressForNormalDeliveryCheckout(): void
+    {
+        $cartId = 42;
+        $shippingExtension = $this->createExtensionMock(null);
+        $quoteExtension = $this->createExtensionMock(null);
+        $shippingAddress = $this->createAddressMock($shippingExtension);
+        $quoteShippingAddress = $this->createAddressMock($quoteExtension);
+        $quoteShippingAddress->method('getShippingMethod')->willReturn('flatrate_flatrate');
+
+        $shippingExtension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $quoteExtension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $shippingAddress->expects($this->never())->method('setFirstname');
+        $shippingAddress->expects($this->never())->method('setStreet');
+        $shippingAddress->expects($this->never())->method('setCity');
+
+        $this->configureFlatrateMethod();
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getShippingAddress')->willReturn($quoteShippingAddress);
+        $this->cartRepository->method('getActive')->with($cartId)->willReturn($quote);
+        $this->addressInformation->method('getShippingAddress')->willReturn($shippingAddress);
+
+        $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testClearsPickupCodeOnBothAddressesWhenDifferentFromIncoming(): void
+    {
+        $cartId = 42;
+        $incomingExtension = $this->createExtensionMock(null);
+        $quoteExtension = $this->createExtensionMock('apple-store');
+        $incomingAddress = $this->createAddressMock($incomingExtension);
+        $quoteShippingAddress = $this->createAddressMock($quoteExtension);
+
+        $incomingExtension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $quoteExtension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $this->expectAddressReset($incomingAddress);
+        $this->expectAddressReset($quoteShippingAddress);
+
+        $this->configureFlatrateMethod();
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getShippingAddress')->willReturn($quoteShippingAddress);
+        $this->cartRepository->method('getActive')->with($cartId)->willReturn($quote);
+        $this->addressInformation->method('getShippingAddress')->willReturn($incomingAddress);
+
+        $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testInitializesExtensionAttributesWhenMissing(): void
+    {
+        $cartId = 42;
+        $extension = $this->createExtensionMock(null);
+        $shippingAddress = $this->createAddressMock(null);
+
+        $this->addressExtensionFactory->expects($this->once())->method('create')->willReturn($extension);
+        $extension->expects($this->once())->method('setPickupLocationCode')->with(null);
+        $shippingAddress->expects($this->once())->method('setExtensionAttributes')->with($extension);
+        $shippingAddress->expects($this->never())->method('setStreet');
+
+        $this->configureFlatrateMethod();
+        $this->configureQuoteWithShippingAddress($cartId, $shippingAddress);
+
+        $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testResetsAddressWhenQuoteShippingMethodIsStillInStorePickup(): void
+    {
+        $cartId = 42;
+        $extension = $this->createExtensionMock(null);
+        $shippingAddress = $this->createAddressMock($extension);
+        $quoteShippingAddress = $this->createAddressMock($extension);
+        $quoteShippingAddress->method('getShippingMethod')->willReturn(InStorePickup::DELIVERY_METHOD);
+
+        $extension->expects($this->exactly(2))->method('setPickupLocationCode')->with(null);
+        $this->expectAddressReset($shippingAddress);
+        $this->expectAddressReset($quoteShippingAddress);
+
+        $this->configureFlatrateMethod();
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getShippingAddress')->willReturn($quoteShippingAddress);
+        $this->cartRepository->method('getActive')->with($cartId)->willReturn($quote);
+        $this->addressInformation->method('getShippingAddress')->willReturn($shippingAddress);
+
+        $this->plugin->beforeSaveAddressInformation(
+            $this->subject,
+            $cartId,
+            $this->addressInformation
+        );
+    }
+
+    /**
+     * @param Address|MockObject $address
+     * @return void
+     */
+    private function expectAddressReset(MockObject $address): void
+    {
+        $address->expects($this->once())->method('setFirstname')->with(null);
+        $address->expects($this->once())->method('setLastname')->with(null);
+        $address->expects($this->once())->method('setCompany')->with(null);
+        $address->expects($this->once())->method('setStreet')->with([]);
+        $address->expects($this->once())->method('setCity')->with(null);
+        $address->expects($this->once())->method('setPostcode')->with(null);
+    }
+
+    /**
+     * @param int $cartId
+     * @param Address|MockObject $shippingAddress
+     * @return void
+     */
+    private function configureQuoteWithShippingAddress(int $cartId, MockObject $shippingAddress): void
+    {
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getShippingAddress')->willReturn($shippingAddress);
+        $this->cartRepository->method('getActive')->with($cartId)->willReturn($quote);
+        $this->addressInformation->method('getShippingAddress')->willReturn($shippingAddress);
+    }
+
+    /**
+     * @return void
+     */
+    private function configureFlatrateMethod(): void
+    {
+        $this->addressInformation->method('getShippingCarrierCode')->willReturn('flatrate');
+        $this->addressInformation->method('getShippingMethodCode')->willReturn('flatrate');
+    }
+
+    /**
+     * @param AddressExtensionInterface|MockObject|null $extension
+     * @return Address|MockObject
+     */
+    private function createAddressMock(?MockObject $extension): MockObject
+    {
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $address->method('getExtensionAttributes')->willReturn($extension);
+
+        return $address;
+    }
+
+    /**
+     * @param string|null $pickupLocationCode
+     * @return AddressExtensionInterface|MockObject
+     */
+    private function createExtensionMock(?string $pickupLocationCode): MockObject
+    {
+        $extension = $this->createPartialMockWithReflection(
+            AddressExtensionInterface::class,
+            ['getPickupLocationCode', 'setPickupLocationCode']
+        );
+        $extension->method('getPickupLocationCode')->willReturn($pickupLocationCode);
+
+        return $extension;
+    }
+}
diff --git a/InventoryInStorePickupQuoteGraphQl/composer.json b/InventoryInStorePickupQuoteGraphQl/composer.json
index 6cc9274dfb0e..f4eba68808c0 100644
--- a/InventoryInStorePickupQuoteGraphQl/composer.json
+++ b/InventoryInStorePickupQuoteGraphQl/composer.json
@@ -13,7 +13,9 @@
         "magento/module-quote-graph-ql": "100.4.*",
         "magento/module-quote": "101.2.*",
         "magento/module-graph-ql": "100.4.*",
-        "magento/module-inventory": "1.2.*"
+        "magento/module-checkout": "100.4.*",
+        "magento/module-inventory": "1.2.*",
+        "magento/module-inventory-in-store-pickup-shipping-api": "1.1.*"
     },
     "autoload": {
         "files": [
diff --git a/InventoryInStorePickupQuoteGraphQl/etc/graphql/di.xml b/InventoryInStorePickupQuoteGraphQl/etc/graphql/di.xml
index 7eba43545a4b..a53b8f4c91cb 100644
--- a/InventoryInStorePickupQuoteGraphQl/etc/graphql/di.xml
+++ b/InventoryInStorePickupQuoteGraphQl/etc/graphql/di.xml
@@ -9,4 +9,9 @@
     <type name="Magento\QuoteGraphQl\Model\Cart\GetShippingAddress">
         <plugin name="adapt_set_shipping_address_on_cart_for_store_pickup_plugin" type="Magento\InventoryInStorePickupQuoteGraphQl\Model\Cart\GetShippingAddress\AdaptGetShippingAddressPlugin"/>
     </type>
+    <type name="Magento\Checkout\Model\ShippingInformationManagement">
+        <plugin name="inventory_in_store_pickup_quote_graphql_clear_pickup_on_non_pickup_shipping_method"
+                type="Magento\InventoryInStorePickupQuoteGraphQl\Plugin\Checkout\ClearPickupLocationOnNonPickupShippingMethodPlugin"
+                sortOrder="10"/>
+    </type>
 </config>
diff --git a/InventoryInStorePickupQuoteGraphQl/etc/module.xml b/InventoryInStorePickupQuoteGraphQl/etc/module.xml
index cd56efd72cbe..08dd28aad981 100644
--- a/InventoryInStorePickupQuoteGraphQl/etc/module.xml
+++ b/InventoryInStorePickupQuoteGraphQl/etc/module.xml
@@ -11,6 +11,7 @@
             <module name="Magento_QuoteGraphQl" />
             <module name="Magento_Quote" />
             <module name="Magento_GraphQl" />
+            <module name="Magento_Checkout" />
         </sequence>
     </module>
 </config>
diff --git a/InventoryIndexer/Test/Integration/Indexer/Stock/SkuListsProcessorTest.php b/InventoryIndexer/Test/Integration/Indexer/Stock/SkuListsProcessorTest.php
new file mode 100644
index 000000000000..fed799a905d9
--- /dev/null
+++ b/InventoryIndexer/Test/Integration/Indexer/Stock/SkuListsProcessorTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryIndexer\Test\Integration\Indexer\Stock;
+
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\InventoryApi\Test\Fixture\Source as SourceFixture;
+use Magento\InventoryApi\Test\Fixture\SourceItems as SourceItemsFixture;
+use Magento\InventoryApi\Test\Fixture\Stock as StockFixture;
+use Magento\InventoryApi\Test\Fixture\StockSourceLinks as StockSourceLinksFixture;
+use Magento\InventoryIndexer\Model\ResourceModel\GetStockItemData;
+use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
+use Magento\InventorySalesApi\Test\Fixture\StockSalesChannels as StockSalesChannelsFixture;
+use Magento\TestFramework\Fixture\AppIsolation;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager as DataFixtureStorageManager;
+use Magento\TestFramework\Fixture\DbIsolation;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SkuListsProcessorTest extends TestCase
+{
+    /**
+     * @var GetStockItemData
+     */
+    private $getStockItemData;
+
+    protected function setUp(): void
+    {
+        $this->getStockItemData = Bootstrap::getObjectManager()->get(GetStockItemData::class);
+    }
+
+    /**
+     * Product should stay in inventory stock if related product is updated and reindex is run.
+     */
+    #[
+        DbIsolation(false),
+        AppIsolation(true),
+        DataFixture(SourceFixture::class, as: 'source2'),
+        DataFixture(StockFixture::class, as: 'stock2'),
+        DataFixture(
+            StockSourceLinksFixture::class,
+            [['stock_id' => '$stock2.stock_id$', 'source_code' => '$source2.source_code$'],]
+        ),
+        DataFixture(
+            StockSalesChannelsFixture::class,
+            ['stock_id' => '$stock2.stock_id$', 'sales_channels' => ['base']]
+        ),
+        DataFixture(ProductFixture::class, as: 'p1'),
+        DataFixture(ProductFixture::class, ['product_links' => [['sku' => '$p1.sku$', 'type' => 'related']]], 'p2'),
+        DataFixture(ProductFixture::class, ['product_links' => [['sku' => '$p1.sku$', 'type' => 'upsell']]], 'p3'),
+        DataFixture(ProductFixture::class, ['product_links' => [['sku' => '$p1.sku$', 'type' => 'crosssell']]], 'p4'),
+        DataFixture(
+            SourceItemsFixture::class,
+            [
+                ['sku' => '$p1.sku$', 'source_code' => '$source2.source_code$', 'quantity' => 100],
+                ['sku' => '$p2.sku$', 'source_code' => '$source2.source_code$', 'quantity' => 200],
+                ['sku' => '$p3.sku$', 'source_code' => '$source2.source_code$', 'quantity' => 300],
+                ['sku' => '$p4.sku$', 'source_code' => '$source2.source_code$', 'quantity' => 400],
+            ]
+        ),
+    ]
+    public function testReindexListForRelatedProducts()
+    {
+        $fixtures = DataFixtureStorageManager::getStorage();
+
+        $stock = $fixtures->get('stock2');
+        $stockId = $stock->getStockId();
+
+        $sku1 = $fixtures->get('p1')->getSku();
+        $sku2 = $fixtures->get('p2')->getSku();
+        $sku3 = $fixtures->get('p3')->getSku();
+        $sku4 = $fixtures->get('p4')->getSku();
+
+        // All products should be in inventory_stock_2 table, none should be deleted at reindex.
+        // Reindex is triggered when source is assigned to products
+        self::assertEquals(
+            [GetStockItemDataInterface::QUANTITY => 100, GetStockItemDataInterface::IS_SALABLE => 1],
+            $this->getStockItemData->execute($sku1, $stockId),
+            "First product should be present in inventory_stock_" . $stockId
+        );
+        self::assertEquals(
+            [GetStockItemDataInterface::QUANTITY => 200, GetStockItemDataInterface::IS_SALABLE => 1],
+            $this->getStockItemData->execute($sku2, $stockId),
+            "Second product should be present in inventory_stock_" . $stockId
+        );
+        self::assertEquals(
+            [GetStockItemDataInterface::QUANTITY => 300, GetStockItemDataInterface::IS_SALABLE => 1],
+            $this->getStockItemData->execute($sku3, $stockId),
+            "Third product should be present in inventory_stock_" . $stockId
+        );
+        self::assertEquals(
+            [GetStockItemDataInterface::QUANTITY => 400, GetStockItemDataInterface::IS_SALABLE => 1],
+            $this->getStockItemData->execute($sku4, $stockId),
+            "Fourth product should be present in inventory_stock_" . $stockId
+        );
+    }
+}
diff --git a/InventoryIndexer/etc/queue_publisher.xml b/InventoryIndexer/etc/queue_publisher.xml
index 77b3cae270f7..91b62731608e 100644
--- a/InventoryIndexer/etc/queue_publisher.xml
+++ b/InventoryIndexer/etc/queue_publisher.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="inventory.indexer.sourceItem" queue="inventory.indexer.sourceItem"/>
-    <publisher topic="inventory.indexer.stock" queue="inventory.indexer.stock"/>
-    <publisher topic="inventory.reservations.updateSalabilityStatus" queue="inventory.reservations.updateSalabilityStatus"/>
+    <publisher topic="inventory.indexer.sourceItem" />
+    <publisher topic="inventory.indexer.stock" />
+    <publisher topic="inventory.reservations.updateSalabilityStatus" />
 </config>
diff --git a/InventoryLowQuantityNotification/Test/Api/DeleteProductTest.php b/InventoryLowQuantityNotification/Test/Api/DeleteProductTest.php
index b353dcfc059c..3a819c86110c 100644
--- a/InventoryLowQuantityNotification/Test/Api/DeleteProductTest.php
+++ b/InventoryLowQuantityNotification/Test/Api/DeleteProductTest.php
@@ -103,9 +103,6 @@ private function rejectMessages()
             'inventory.source.items.cleanup',
             $this->defaultValueProvider->getConnection()
         );
-        if ($this->defaultValueProvider->getConnection() === 'stomp') {
-            $queue->subscribeQueue();
-        }
         while ($envelope = $queue->dequeue()) {
             $queue->reject($envelope, false);
         }
diff --git a/InventoryLowQuantityNotification/Test/Api/UpdateProductSkuTest.php b/InventoryLowQuantityNotification/Test/Api/UpdateProductSkuTest.php
index 8722a48ccb43..22c7deff84d8 100644
--- a/InventoryLowQuantityNotification/Test/Api/UpdateProductSkuTest.php
+++ b/InventoryLowQuantityNotification/Test/Api/UpdateProductSkuTest.php
@@ -124,9 +124,6 @@ private function rejectMessages()
             'inventory.source.items.cleanup',
             $this->defaultValueProvider->getConnection()
         );
-        if ($this->defaultValueProvider->getConnection() === 'stomp') {
-            $queue->subscribeQueue();
-        }
         while ($envelope = $queue->dequeue()) {
             $queue->reject($envelope, false);
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryQuote/MergeCartsTest.php b/InventoryQuoteGraphQl/Test/Api/GraphQl/MergeCartsTest.php
similarity index 98%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryQuote/MergeCartsTest.php
rename to InventoryQuoteGraphQl/Test/Api/GraphQl/MergeCartsTest.php
index c372494c2137..974e1079e175 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/InventoryQuote/MergeCartsTest.php
+++ b/InventoryQuoteGraphQl/Test/Api/GraphQl/MergeCartsTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\InventoryQuote;
+namespace Magento\InventoryQuoteGraphQl\Test\Api\GraphQl;
 
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
diff --git a/InventorySales/etc/queue_publisher.xml b/InventorySales/etc/queue_publisher.xml
index 23f92078b65e..6b90a78774c6 100644
--- a/InventorySales/etc/queue_publisher.xml
+++ b/InventorySales/etc/queue_publisher.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="inventory.reservations.update" queue="inventory.reservations.update"/>
-    <publisher topic="inventory.reservations.cleanup" queue="inventory.reservations.cleanup"/>
+    <publisher topic="inventory.reservations.update" />
+    <publisher topic="inventory.reservations.cleanup" />
 </config>
diff --git a/InventorySalesAdminUi/Test/Mftf/Test/SourcesColumnTnTheSalesOrderGridInMagentoAdminPanelTest.xml b/InventorySalesAdminUi/Test/Mftf/Test/SourcesColumnTnTheSalesOrderGridInMagentoAdminPanelTest.xml
index 3b39aea64356..d9d348363809 100644
--- a/InventorySalesAdminUi/Test/Mftf/Test/SourcesColumnTnTheSalesOrderGridInMagentoAdminPanelTest.xml
+++ b/InventorySalesAdminUi/Test/Mftf/Test/SourcesColumnTnTheSalesOrderGridInMagentoAdminPanelTest.xml
@@ -60,6 +60,7 @@
              <argument name="tags" value=""/>
          </actionGroup>
 
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
          <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
      </after>
 
diff --git a/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderStockReservationRollbackTest.xml b/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderStockReservationRollbackTest.xml
index 8a28efd089c8..59225db6081e 100644
--- a/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderStockReservationRollbackTest.xml
+++ b/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderStockReservationRollbackTest.xml
@@ -39,6 +39,9 @@
                 <argument name="email" value="{{CustomerEntityOne.email}}"/>
             </actionGroup>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderWithAsyncStockReservationTest.xml b/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderWithAsyncStockReservationTest.xml
index d1358789a051..675858aaa47c 100644
--- a/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderWithAsyncStockReservationTest.xml
+++ b/InventorySalesAsyncOrder/Test/Mftf/Test/AsyncOrderWithAsyncStockReservationTest.xml
@@ -45,6 +45,9 @@
                 <argument name="email" value="{{CustomerEntityOne.email}}"/>
             </actionGroup>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid"/>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
diff --git a/InventorySalesAsyncOrder/Test/Mftf/test-dependency-allowlist b/InventorySalesAsyncOrder/Test/Mftf/test-dependency-allowlist
index 56fa7f3b11d9..ed685a651b1b 100644
--- a/InventorySalesAsyncOrder/Test/Mftf/test-dependency-allowlist
+++ b/InventorySalesAsyncOrder/Test/Mftf/test-dependency-allowlist
@@ -5,3 +5,5 @@ CliConsumerStartActionGroup
 AssertRejectedOrderInGridActionGroup
 AsyncOrderStockReservationTest
 AssertProcessedOrderInGridActionGroup
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/InventoryShippingAdminUi/Test/Mftf/Test/QtyCheckShipmentForMultiProductOrderWithMultiSourceTest.xml b/InventoryShippingAdminUi/Test/Mftf/Test/QtyCheckShipmentForMultiProductOrderWithMultiSourceTest.xml
index 213c7e9f89c9..952a0ca465a6 100644
--- a/InventoryShippingAdminUi/Test/Mftf/Test/QtyCheckShipmentForMultiProductOrderWithMultiSourceTest.xml
+++ b/InventoryShippingAdminUi/Test/Mftf/Test/QtyCheckShipmentForMultiProductOrderWithMultiSourceTest.xml
@@ -97,6 +97,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventoryShippingAdminUi/Test/Mftf/Test/SourcesPagerForOrderShipmentTest.xml b/InventoryShippingAdminUi/Test/Mftf/Test/SourcesPagerForOrderShipmentTest.xml
index 5da7fbfa0c16..3f408a09074a 100644
--- a/InventoryShippingAdminUi/Test/Mftf/Test/SourcesPagerForOrderShipmentTest.xml
+++ b/InventoryShippingAdminUi/Test/Mftf/Test/SourcesPagerForOrderShipmentTest.xml
@@ -213,6 +213,7 @@
                 <argument name="stockName" value="{{_defaultStock.name}}"/>
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFiltersAfter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
             <!--Remove category, product, customer and additional stock.-->
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/InventorySwatchesFrontendUi/Test/Mftf/Test/StorefrontValidateVisualSwatchAbsenceOfAttributeWhenProductStocksOutTest.xml b/InventorySwatchesFrontendUi/Test/Mftf/Test/StorefrontValidateVisualSwatchAbsenceOfAttributeWhenProductStocksOutTest.xml
index 97c54c35682c..e85f5e73c28a 100644
--- a/InventorySwatchesFrontendUi/Test/Mftf/Test/StorefrontValidateVisualSwatchAbsenceOfAttributeWhenProductStocksOutTest.xml
+++ b/InventorySwatchesFrontendUi/Test/Mftf/Test/StorefrontValidateVisualSwatchAbsenceOfAttributeWhenProductStocksOutTest.xml
@@ -62,6 +62,9 @@
             <actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
                 <argument name="categoryEntity" value="SimpleSubCategory"/>
             </actionGroup>
+            <!--Clear filter product listing grid-->
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPageBeforeClearFilters"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/InventorySwatchesFrontendUi/Test/Mftf/test-dependency-allowlist b/InventorySwatchesFrontendUi/Test/Mftf/test-dependency-allowlist
index a0f1db1b3e56..3f909f3eb951 100644
--- a/InventorySwatchesFrontendUi/Test/Mftf/test-dependency-allowlist
+++ b/InventorySwatchesFrontendUi/Test/Mftf/test-dependency-allowlist
@@ -41,3 +41,5 @@ StorefrontAddProductToCartWithQtyActionGroup
 StorefrontOpenCartFromMinicartActionGroup
 StorefrontClickProceedToCheckoutActionGroup
 ClickPlaceOrderActionGroup
+AdminOpenCatalogProductPageActionGroup
+ClearFiltersAdminProductGridActionGroup
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php b/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
deleted file mode 100644
index f0562b5fc2ee..000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/Plugin/CatalogInventory/Model/StockRegistryProvider/GetNonCachedStockItemPlugin.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright 2022 Adobe
- * All Rights Reserved.
- */
-declare(strict_types=1);
-
-namespace Magento\TestModuleInventoryStateCache\Plugin\CatalogInventory\Model\StockRegistryProvider;
-
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
-use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
-use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
-use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
-
-/**
- * Get non cached stock item for integration tests plugin.
- *
- * Using StockRegistryStorage as local cache for getting stock items leads to not adding stock items to DB
- * in case of multiple test cases running in a row with the same products.
- *
- * phpcs:disable Generic.Classes.DuplicateClassName
- */
-class GetNonCachedStockItemPlugin
-{
-    /**
-     * @var StockItemCriteriaInterfaceFactory
-     */
-    private $stockItemCriteriaFactory;
-
-    /**
-     * @var StockItemRepositoryInterface
-     */
-    private $stockItemRepository;
-
-    /**
-     * @var StockItemInterfaceFactory
-     */
-    private $stockItemFactory;
-
-    /**
-     * @param StockItemCriteriaInterfaceFactory $stockItemCriteriaFactory
-     * @param StockItemRepositoryInterface $stockItemRepository
-     * @param StockItemInterfaceFactory $stockItemFactory
-     */
-    public function __construct(
-        StockItemCriteriaInterfaceFactory $stockItemCriteriaFactory,
-        StockItemRepositoryInterface $stockItemRepository,
-        StockItemInterfaceFactory $stockItemFactory
-    ) {
-        $this->stockItemCriteriaFactory = $stockItemCriteriaFactory;
-        $this->stockItemRepository = $stockItemRepository;
-        $this->stockItemFactory = $stockItemFactory;
-    }
-
-    /**
-     * Get non cached stock items for product.
-     *
-     * @param StockRegistryProviderInterface $subject
-     * @param \Closure $proceed
-     * @param int|null $productId
-     * @param int|null $stockId
-     * @return StockItemInterface
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function aroundGetStockItem(
-        StockRegistryProviderInterface $subject,
-        \Closure $proceed,
-        ?int $productId,
-        ?int $stockId
-    ): StockItemInterface {
-        $criteria = $this->stockItemCriteriaFactory->create();
-        $criteria->setProductsFilter($productId);
-        $collection = $this->stockItemRepository->getList($criteria);
-        $stockItem = current($collection->getItems());
-        if (!$stockItem || !$stockItem->getItemId()) {
-            $stockItem = $this->stockItemFactory->create();
-        }
-
-        return $stockItem;
-    }
-}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/di.xml
deleted file mode 100644
index 4c1b4c242e47..000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/di.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright 2019 Adobe
- * All Rights Reserved.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\InventorySalesApi\Model\GetAssignedSalesChannelsForStockInterface" type="Magento\InventorySales\Model\GetAssignedSalesChannelsForStock"/>
-    <preference for="Magento\InventorySalesApi\Api\GetStockBySalesChannelInterface" type="Magento\InventorySales\Model\GetStockBySalesChannel"/>
-</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml
deleted file mode 100644
index d80e6b7d3a20..000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleInventoryStateCache/etc/frontend/di.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright 2020 Adobe
- * All Rights Reserved.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\InventorySalesApi\Model\GetStockItemDataInterface" type="Magento\InventoryIndexer\Model\ResourceModel\GetStockItemData"/>
-    <preference for="Magento\InventorySalesApi\Model\GetStockItemsDataInterface" type="Magento\InventoryIndexer\Model\ResourceModel\GetStockItemsData"/>
-    <type name="Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface">
-        <plugin name="get_non_cached_stock_items" type="Magento\TestModuleInventoryStateCache\Plugin\CatalogInventory\Model\StockRegistryProvider\GetNonCachedStockItemPlugin"/>
-    </type>
-</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/events.xml b/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/events.xml
deleted file mode 100644
index c6fbdeda3344..000000000000
--- a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/events.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright 2020 Adobe
- * All Rights Reserved.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="sales_quote_item_collection_products_after_load">
-        <observer name="inventory_catalog_preload_cache" disabled="true"/>
-    </event>
-</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/module.xml
deleted file mode 100644
index 15ecb879bc0e..000000000000
--- a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/etc/module.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright 2019 Adobe
- * All Rights Reserved.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleInventoryStateCache">
-        <sequence>
-            <module name="Magento_InventoryApi"/>
-            <module name="Magento_InventoryCatalogApi"/>
-            <module name="Magento_InventorySalesApi"/>
-            <module name="Magento_InventoryReservationsApi"/>
-            <module name="Magento_CatalogInventory"/>
-        </sequence>
-    </module>
-</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/registration.php b/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/registration.php
deleted file mode 100644
index 52748b494de3..000000000000
--- a/dev/tests/integration/_files/Magento/TestModuleInventoryStateCache/registration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright 2019 Adobe
- * All Rights Reserved.
- */
-declare(strict_types=1);
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-$registrar = new ComponentRegistrar();
-if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleInventoryStateCache') === null) {
-    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleInventoryStateCache', __DIR__);
-}