diff --git a/Block/Adminhtml/Queue/Status.php b/Block/Adminhtml/Queue/Status.php
index 10bd9c400..9c877ff13 100644
--- a/Block/Adminhtml/Queue/Status.php
+++ b/Block/Adminhtml/Queue/Status.php
@@ -158,7 +158,7 @@ private function isQueueFast()
     {
         $averageProcessingTime = $this->queue->getAverageProcessingTime();
 
-        return !is_null($averageProcessingTime) && $averageProcessingTime < self::QUEUE_FAST_LIMIT;
+        return $averageProcessingTime !== null && $averageProcessingTime < self::QUEUE_FAST_LIMIT;
     }
 
     /** @return int */
diff --git a/Block/Configuration.php b/Block/Configuration.php
index f788e5473..8d8be8b1d 100755
--- a/Block/Configuration.php
+++ b/Block/Configuration.php
@@ -27,7 +27,7 @@ public function isSearchPage(): bool
 
             if ($this->getConfigHelper()->replaceCategories() && $request->getControllerName() === 'category') {
                 $category = $this->getCurrentCategory();
-                if ($category && $category->getDisplayMode() !== 'PAGE') {
+                if ($category->getId() && $category->getDisplayMode() !== 'PAGE') {
                     return true;
                 }
             }
@@ -125,7 +125,7 @@ public function getConfiguration()
             && $request->getControllerName() === 'category') {
             $category = $this->getCurrentCategory();
 
-            if ($category && $category->getDisplayMode() !== 'PAGE') {
+            if ($category->getId() && $category->getDisplayMode() !== 'PAGE') {
                 $category->getUrlInstance()->setStore($this->getStoreId());
                 if (self::IS_CATEGORY_NAVIGATION_ENABLED) {
                     $childCategories = $this->getChildCategoryUrls($category);
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55aacba88..d6e565f61 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,39 @@
 # CHANGE LOG
 
+## 3.17.0
+
+### Features
+- Added an Algolia indexing cache for storing metadata to prevent extra queries. Large collections that run periodic full indexes can benefit from this cache. 
+- Price indexing is now optional. If the price attribute is not present in the product attributes, sorts, facets or custom ranking then that information will not be indexed in the product record.
+- Creating a temporary index while performing a full index is now optional and can be enabled or disabled in the Magento admin.
+- Added Batching optimizer feature which performs a catalog analysis and provides recommendation regarding optimal batching size for indexing.
+- Added Clear queue CLI command which handles indexing queue clearing from the console.
+
+### Updates
+- Fixed Indexing Queue merging mechanism, it should now have way better performances with delta indexing (updates) jobs.
+- Updated CLI command organization, queue related commands now have a different prefix compared to the indexing ones.
+- Updated default "Maximum number of records sent per indexing request" to 1000 (previously 300).
+- Updated `ConfigHelper` class, it now has more methods deprecated and ported to separate helper classes.
+- Updated Unit and Integration tests.
+- Removed all `is_null` occurrences
+
+### Bug fixes
+- Fixed indexing queue templates escaping.
+- Fixed 3.17 setup:upgrade on PHP 8.4
+- Performed code sanitization for Codacy compliance
+- Fixed issue where missing pricing keys were not handled gracefully in the Autocomplete product template
+- Fixed issue where category was not properly checked in the configuration block - thank you @benjamin-volle
+- Fixed issue on duplicated product save
+
 ## 3.16.1
 
 ### Updates
 - Add checks on configuration migration processed on data patch
 - `EventProcessor` now calculates decimal precision on currency based on `Magento\Framework\Locale\FormatInterface`
+- Local InstantSearch widgets can now override facet sorting behavior in merchandising rules
 - Updated various unit/integration tests
 
-### Bug fixes 
+### Bug fixes
 - Fixed Indexing Queue display in backend templates.
 - Fixed Indexing Queue merging mechanism, it should now have way better performances with delta indexing (updates) jobs.
 - Fixed implicit nullable types for PHP 8.4
@@ -15,6 +41,7 @@
 - Apply rounding to insight events revenue values to avoid floating point precision errors - thank you @PromInc
 - Fix issue where double conversion occurred during price indexing in case of multi currency stores - thank you @natedawg92
 - Fix issue where non-clickable links where rendered on InstantSearch - thank you @PromInc
+- Fixed issue where replica setting forwarding can abort if async operation fails to complete in time
 - Fixed some Codacy issues
 
 ## 3.16.0
diff --git a/Console/Command/AbstractStoreCommand.php b/Console/Command/AbstractStoreCommand.php
index f6481f9c8..92b94c194 100644
--- a/Console/Command/AbstractStoreCommand.php
+++ b/Console/Command/AbstractStoreCommand.php
@@ -127,10 +127,10 @@ protected function decorateOperationAnnouncementMessage(string $msg, array $stor
             : "<info>$msg</info>";
     }
 
-    protected function confirmOperation(string $okMessage = '', string $cancelMessage = 'Operation cancelled'): bool
+    protected function confirmOperation(string $okMessage = '', string $cancelMessage = 'Operation cancelled', bool $default = false): bool
     {
         $helper = $this->getHelper('question');
-        $question = new ConfirmationQuestion('<question>Are you sure wish to proceed? (y/n)</question> ', false);
+        $question = new ConfirmationQuestion('<question>Are you sure wish to proceed? (y/n)</question> ', $default);
         if (!$helper->ask($this->input, $this->output, $question)) {
             if ($cancelMessage) {
                 $this->output->writeln("<comment>$cancelMessage</comment>");
diff --git a/Console/Command/BatchingOptimizeCommand.php b/Console/Command/BatchingOptimizeCommand.php
new file mode 100644
index 000000000..26e0c3266
--- /dev/null
+++ b/Console/Command/BatchingOptimizeCommand.php
@@ -0,0 +1,455 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Console\Command;
+
+use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
+use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Helper\MathHelper;
+use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
+use Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder;
+use Algolia\AlgoliaSearch\Service\Product\RecordBuilder;
+use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class BatchingOptimizeCommand extends AbstractStoreCommand
+{
+    /**
+     * Recommended Max batch size
+     * https://www.algolia.com/doc/guides/sending-and-managing-data/send-and-update-your-data/how-to/sending-records-in-batches/
+     */
+    protected const MAX_BATCH_SIZE_IN_BYTES = 10_000_000; //10MB
+
+    /**
+     * Margin to ensure not to exceed maximum batch size when catalog is a mix between various product types
+     * (i.e. with a lot of record sizes variations) - can be updated by the --margin option (from 0.25 to 3.00)
+     * 0.00 => Lowest possible value (0.00 * standard deviation = 0), the recommended batch size will be almost equal to the strictly calculated maximum batch size
+     * 0.25 => Default value (0.25 * standard deviation), the recommended batch size will be close to the strictly calculated maximum batch size
+     * 3.00 => Highest possible value (3 * standard deviation), the recommended batch size will be greatly lower than the calculated maximum batch size
+     */
+    protected const DEFAULT_MARGIN = 0.25;
+
+    /**
+     * Min value for safety margin
+     */
+    protected const MIN_MARGIN = 0;
+
+    /**
+     * Max value for safety margin
+     */
+    protected const MAX_MARGIN = 3;
+
+    /**
+     * The sample size if the amount of products fetched to determine the recommended batch size
+     * Can be updated by the --sample-size option
+     */
+    protected const DEFAULT_SAMPLE_SIZE = 20;
+
+    /**
+     * Max Sample size
+     */
+    protected const MAX_SAMPLE_SIZE = 1000;
+
+    protected const OPTION_SAMPLE_SIZE = 'sample-size';
+    protected const OPTION_SAMPLE_SIZE_SHORTCUT = 's';
+
+    protected const OPTION_MARGIN = 'margin';
+    protected const OPTION_MARGIN_SHORTCUT = 'm';
+
+    /**
+     * Simple product types (should generate smaller product records)
+     */
+    protected const PRODUCTS_SIMPLE_TYPES = [
+        'simple',
+        'downloadable',
+        'virtual',
+        'giftcard'
+    ];
+
+    /**
+     * Complex product types (should generate bigger product records)
+     */
+    protected const PRODUCTS_COMPLEX_TYPES = [
+        'configurable',
+        'grouped',
+        'bundle'
+    ];
+
+    /**
+     * @var array|null
+     */
+    protected ?array $storeCounts = [];
+
+    public function __construct(
+        protected AlgoliaConnector      $algoliaConnector,
+        protected State                 $state,
+        protected StoreNameFetcher      $storeNameFetcher,
+        protected StoreManagerInterface $storeManager,
+        protected IndexOptionsBuilder   $indexOptionsBuilder,
+        protected ProductHelper         $productHelper,
+        protected ConfigHelper          $configHelper,
+        protected RecordBuilder         $recordBuilder,
+        protected WriterInterface       $configWriter,
+        ?string                         $name = null
+    ) {
+        parent::__construct($state, $storeNameFetcher, $name);
+    }
+
+    protected function getCommandPrefix(): string
+    {
+        return parent::getCommandPrefix() . 'batching:';
+    }
+
+    protected function getCommandName(): string
+    {
+        return 'optimize';
+    }
+
+    protected function getCommandDescription(): string
+    {
+        return "Performs catalog analysis and provides recommendation regarding optimal batching size for product indexing.";
+    }
+
+    protected function getStoreArgumentDescription(): string
+    {
+        return 'ID(s) for store(s) to optimize (optional), if no store is specified, all stores will be taken into account.';
+    }
+
+    protected function getAdditionalDefinition(): array
+    {
+        return [
+            new InputOption(
+                self::OPTION_SAMPLE_SIZE,
+                '-' . self::OPTION_SAMPLE_SIZE_SHORTCUT,
+                InputOption::VALUE_REQUIRED,
+                'Sample size (number of products) - DEFAULT: ' . self::DEFAULT_SAMPLE_SIZE . ' - MAXIMUM: ' . self::MAX_SAMPLE_SIZE,
+            ),
+            new InputOption(
+                self::OPTION_MARGIN,
+                '-' . self::OPTION_MARGIN_SHORTCUT,
+                InputOption::VALUE_REQUIRED,
+                'Safety margin - DEFAULT: ' . self::DEFAULT_MARGIN . ' - FROM ' . self::MIN_MARGIN . ' TO ' . self::MAX_MARGIN,
+            )
+        ];
+    }
+
+    /**
+     * @throws NoSuchEntityException|LocalizedException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->input = $input;
+        $this->output = $output;
+        $this->setAreaCode();
+
+        $storeIds = $this->getStoreIds($input);
+
+        try {
+            $this->validateOptions();
+            $this->scanProductRecords($storeIds);
+        } catch (\Exception $e) {
+            $this->output->writeln('<error>' . $e->getMessage() . '</error>');
+            return CLI::RETURN_FAILURE;
+        }
+
+        return Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * Ensures sample size and margin options are valid
+     *
+     * @return void
+     * @throws AlgoliaException
+     */
+    protected function validateOptions(): void
+    {
+        if (
+            $this->input->getOption(self::OPTION_SAMPLE_SIZE)
+            && (
+                !ctype_digit((string) $this->input->getOption(self::OPTION_SAMPLE_SIZE))
+                || (int) $this->input->getOption(self::OPTION_SAMPLE_SIZE) > self::MAX_SAMPLE_SIZE
+            )
+        ) {
+            throw new AlgoliaException("Sample size option should be an integer (maximum 1000)" );
+        }
+
+        if (
+            $this->input->getOption(self::OPTION_MARGIN)
+            && (
+                !is_numeric($this->input->getOption(self::OPTION_MARGIN))
+                || (float) $this->input->getOption(self::OPTION_MARGIN) > self::MAX_MARGIN
+                || (float) $this->input->getOption(self::OPTION_MARGIN) < self::MIN_MARGIN
+            )
+        ) {
+            throw new AlgoliaException("Margin option should be a  decimal value (between 0 and 3)" );
+        }
+    }
+
+    /**
+     * @param array $storeIds
+     * @return void
+     * @throws AlgoliaException
+     * @throws DiagnosticsException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    protected function scanProductRecords(array $storeIds = []): void
+    {
+        if (count($storeIds)) {
+            foreach ($storeIds as $storeId) {
+                $this->scanProductRecordsForStore($storeId);
+            }
+        } else {
+            $this->scanProductRecordsForAllStores();
+        }
+    }
+
+    /**
+     * @return void
+     * @throws AlgoliaException
+     * @throws DiagnosticsException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    protected function scanProductRecordsForAllStores(): void
+    {
+        $storeIds = array_keys($this->storeManager->getStores());
+
+        foreach ($storeIds as $storeId) {
+            $this->scanProductRecordsForStore($storeId);
+        }
+    }
+
+    /**
+     * @param int $storeId
+     * @return void
+     * @throws AlgoliaException
+     * @throws DiagnosticsException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    protected function scanProductRecordsForStore(int $storeId): void
+    {
+        $storeName = $this->storeNameFetcher->getStoreName($storeId);
+
+        if (!$this->configHelper->isIndexingEnabled($storeId)) {
+            $this->output->writeln('<info>Indexing is disabled for store ' . $storeName . '</info>');
+            return;
+        }
+
+        if (!isset($this->storeCounts[$storeId])) {
+            $this->output->writeln('<info>Scanning products for store ' . $storeName . '...</info>');
+            $this->setStoreCounts($storeId);
+        }
+
+        $this->output->writeln(' ');
+        $this->output->writeln('<info> ====== Products for store ' . $storeName . ' ====== </info>');
+        $this->output->writeln('<comment>Simple Products</comment>:  ' . $this->storeCounts[$storeId]['simple'] . ' (' . round($this->storeCounts[$storeId]['simple_percentage'], 2)  . '% of total)');
+        $this->output->writeln('<comment>Complex Products</comment>: ' . $this->storeCounts[$storeId]['complex'] . ' (' . round($this->storeCounts[$storeId]['complex_percentage'], 2) . '% of total)');
+
+        $this->output->writeln('<info> ============ </info>');
+        $this->output->writeln('<comment>Total</comment>: ' . $this->storeCounts[$storeId]['total'] . ' products');
+
+        $this->output->writeln('<info> ============ </info>');
+
+        $sample = $this->storeCounts[$storeId]['sample'];
+
+        if (count($sample) > 0) {
+            $this->output->writeln('<comment>Sample (' . count($sample) . ' products):</comment>');
+            foreach ($sample as $sku => $size) {
+                $this->output->writeln(' - ' . $size . 'B (sku: ' . $sku . ')');
+            }
+        }
+
+        $this->output->writeln('<info> ============ </info>');
+        $sizeAverage = (int) round(MathHelper::getAverage($sample));
+        $this->output->writeln('<comment>Min record size</comment>             : ' . $this->storeCounts[$storeId]['sample_min'] . 'B');
+        $this->output->writeln('<comment>Max record size</comment>             : ' . $this->storeCounts[$storeId]['sample_max'] . 'B');
+        $this->output->writeln('<comment>Average record size</comment>         : ' . $sizeAverage . 'B');
+
+        $estimatedBatchCount = $this->getEstimatedMaxBatchCount($sizeAverage);
+        $this->output->writeln('<comment>Estimated Max batch count</comment>   : ' . $estimatedBatchCount . ' records');
+
+        $standardDeviation = MathHelper::getSampleStandardDeviation($sample);
+        $this->output->writeln('<comment>Standard Deviation</comment>          : ' . $standardDeviation);
+
+        $margin = $this->input->getOption(self::OPTION_MARGIN) ?? self::DEFAULT_MARGIN;
+        $this->output->writeln('<comment>Safety margin</comment>               : ' . $margin);
+
+        $recommendedBatchCount = $this->getRecommendedBatchCount($sizeAverage, $standardDeviation, $margin);
+        $this->output->writeln('<info> ============ </info>');
+        $this->output->writeln('<info>Recommended batch count</info>     : ' . $recommendedBatchCount . ' records');
+        $this->output->writeln(' ');
+        $this->output->writeln('<fg=red>Important:</fg=red> Those numbers are estimates only. Indexing activity should be monitored after making changes to ensure batches are not exceeding the recommended size of 10 MB.');
+        $this->output->writeln('<info> ============ </info>');
+        $this->output->writeln(
+            'This will override your "Maximum number of records sent per indexing request" configuration to <info>' . $recommendedBatchCount . '</info> for store "' . $storeName . '".');
+        $this->output->writeln(' ');
+
+        if ($this->confirmOperation('Applying optimized batching configuration', 'Batching optimization cancelled - settings were NOT changed', true)) {
+            $this->configWriter->save(
+                ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE,
+                $recommendedBatchCount,
+                'stores',
+                $storeId
+            );
+        }
+    }
+
+    /**
+     * @param int $storeId
+     * @return void
+     * @throws AlgoliaException
+     * @throws DiagnosticsException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    protected function setStoreCounts(int $storeId): void
+    {
+        $simpleProducts = $this->getProductsCollectionForStore($storeId, self::PRODUCTS_SIMPLE_TYPES);
+        $complexProducts = $this->getProductsCollectionForStore($storeId, self::PRODUCTS_COMPLEX_TYPES);
+
+        $this->storeCounts[$storeId] = [
+            'simple' => $this->getRawCount($simpleProducts),
+            'complex' => $this->getRawCount($complexProducts)
+        ];
+
+        $this->storeCounts[$storeId]['total'] =
+            (int) $this->storeCounts[$storeId]['simple'] + (int) $this->storeCounts[$storeId]['complex'];
+
+        $this->storeCounts[$storeId]['simple_percentage'] = $this->storeCounts[$storeId]['total'] > 0 ?
+            ($this->storeCounts[$storeId]['simple'] * 100) / $this->storeCounts[$storeId]['total'] :
+            0;
+
+        $this->storeCounts[$storeId]['complex_percentage'] = $this->storeCounts[$storeId]['total'] > 0 ?
+            ($this->storeCounts[$storeId]['complex'] * 100) / $this->storeCounts[$storeId]['total']:
+            0;
+
+
+        $sampleSize = $this->input->getOption(self::OPTION_SAMPLE_SIZE) ?? self::DEFAULT_SAMPLE_SIZE;
+        $simpleSampleSize = (int)round($sampleSize * ($this->storeCounts[$storeId]['simple_percentage'] / 100));
+        $complexSampleSize = (int)round($sampleSize * ($this->storeCounts[$storeId]['complex_percentage'] / 100));
+
+        $this->storeCounts[$storeId]['simple_sample_size'] = $simpleSampleSize;
+        $this->storeCounts[$storeId]['complex_sample_size'] = $complexSampleSize;
+
+        $this->storeCounts[$storeId]['sample'] = array_merge(
+            $this->getProductsSizes($simpleProducts, $simpleSampleSize),
+            $this->getProductsSizes($complexProducts, $complexSampleSize)
+        );
+
+        $this->storeCounts[$storeId]['sample_min'] = min($this->storeCounts[$storeId]['sample']);
+        $this->storeCounts[$storeId]['sample_max'] = max($this->storeCounts[$storeId]['sample']);
+    }
+
+    /**
+     * Generates a product collection with the same helper as the product indexer to get the exact amount of expected products in the Algolia index
+     *
+     * @param int $storeId
+     * @param array $productTypes
+     * @return Collection
+     */
+    protected function getProductsCollectionForStore(int $storeId, array $productTypes = []): Collection
+    {
+        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex();
+        $collection = $this->productHelper->getProductCollectionQuery($storeId, null, $onlyVisible);
+        if (count($productTypes) > 0) {
+            $collection->addAttributeToFilter('type_id', ['in' => $productTypes]);
+        }
+
+        // Randomize the results to get a more "diverse" sample
+        $collection->getSelect()->orderRand();
+
+        return $collection;
+    }
+
+    /**
+     * Relying on Collection count method will unnecessarily hydrate the collection and consume memory
+     * This method will return the count of the collection without hydrating it
+     *
+     * @param Collection $collection
+     * @return int
+     */
+    protected function getRawCount(Collection $collection): int
+    {
+        $sql = $collection->getSelect()->__toString();
+
+        $connection = $collection->getConnection();
+
+        $rows = $connection->fetchAll($sql);
+
+        return count($rows);
+    }
+
+    /**
+     * @param Collection $products
+     * @param int $sampleSize
+     * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws DiagnosticsException
+     * @throws AlgoliaException
+     */
+    protected function getProductsSizes(Collection $products, int $sampleSize): array
+    {
+        if ($sampleSize === 0) {
+            return [];
+        }
+
+        $stats = [];
+
+        $products->setPageSize($sampleSize)->setCurPage(1);
+
+        foreach ($products as $product) {
+            $serializedRecord = json_encode($this->recordBuilder->buildRecord($product));
+
+            if (function_exists('mb_strlen')) {
+                $size = mb_strlen($serializedRecord, '8bit');
+            } else {
+                $size = strlen($serializedRecord);
+            }
+
+            $stats[$product->getSku()] = $size;
+        }
+
+        return $stats;
+    }
+
+    /**
+     * Determines the maximum estimated batch count which will be considered as the upper boundary
+     *
+     * @param int $averageSize
+     * @return int
+     */
+    protected function getEstimatedMaxBatchCount(int $averageSize): int
+    {
+        return (int) round(self::MAX_BATCH_SIZE_IN_BYTES / $averageSize);
+    }
+
+    /**
+     * Provides a recommended batch count according to:
+     *  - the average record size provided by the product sample
+     *  - the standard deviation of the product sample
+     *  - an arbitrary safety margin (1 to 10) to allow the user to alter the strictness of the recommendation
+     *    (the lower the margin is, the closer it will be from the maximum batch count)
+     *
+     * @param int $averageSize
+     * @param float $standardDeviation
+     * @param float $margin
+     * @return int
+     */
+    protected function getRecommendedBatchCount(int $averageSize, float $standardDeviation, float $margin = self::DEFAULT_MARGIN): int
+    {
+        return (int) (self::MAX_BATCH_SIZE_IN_BYTES / ($averageSize + $margin * $standardDeviation));
+    }
+}
diff --git a/Console/Command/Indexer/IndexProductsCommand.php b/Console/Command/Indexer/IndexProductsCommand.php
index 65c69089b..660dc70bb 100644
--- a/Console/Command/Indexer/IndexProductsCommand.php
+++ b/Console/Command/Indexer/IndexProductsCommand.php
@@ -2,8 +2,8 @@
 
 namespace Algolia\AlgoliaSearch\Console\Command\Indexer;
 
+use Algolia\AlgoliaSearch\Api\Processor\BatchQueueProcessorInterface;
 use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
-use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor as ProductBatchQueueProcessor;
 use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\Store\Model\StoreManagerInterface;
@@ -13,7 +13,7 @@
 class IndexProductsCommand extends AbstractIndexerCommand
 {
     public function __construct(
-        protected ProductBatchQueueProcessor $productBatchQueueProcessor,
+        protected BatchQueueProcessorInterface $productBatchQueueProcessor,
         protected StoreManagerInterface $storeManager,
         State $state,
         StoreNameFetcher $storeNameFetcher,
diff --git a/Console/Command/Queue/ClearQueueCommand.php b/Console/Command/Queue/ClearQueueCommand.php
new file mode 100644
index 000000000..d50a6bf11
--- /dev/null
+++ b/Console/Command/Queue/ClearQueueCommand.php
@@ -0,0 +1,234 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Console\Command\Queue;
+
+use Algolia\AlgoliaSearch\Console\Command\AbstractStoreCommand;
+use Algolia\AlgoliaSearch\Model\ResourceModel\Job as JobResourceModel;
+use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ClearQueueCommand extends AbstractStoreCommand
+{
+    public function __construct(
+        protected State                 $state,
+        protected StoreNameFetcher      $storeNameFetcher,
+        protected StoreManagerInterface $storeManager,
+        protected JobResourceModel      $jobResourceModel,
+        ?string                         $name = null
+    ) {
+        parent::__construct($state, $storeNameFetcher, $name);
+    }
+
+    protected function getCommandPrefix(): string
+    {
+        return parent::getCommandPrefix() . 'queue:';
+    }
+
+    protected function getCommandName(): string
+    {
+        return 'clear';
+    }
+
+    protected function getCommandDescription(): string
+    {
+        return "Clear the indexing queue for specified store(s) or all stores. This will remove all pending indexing jobs from the queue.";
+    }
+
+    protected function getStoreArgumentDescription(): string
+    {
+        return 'ID(s) for store(s) to clear indexing queue (optional), if not specified, indexing queue for all stores will be cleared. Pass multiple store IDs as a list of integers separated by spaces. e.g.: <info>bin/magento algolia:queue:clear 1 2 3</info>';
+    }
+
+    protected function getAdditionalDefinition(): array
+    {
+        return [];
+    }
+
+    /**
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->input = $input;
+        $this->output = $output;
+        $this->setAreaCode();
+
+        if (!$this->confirmClearOperation()) {
+            return Cli::RETURN_SUCCESS;
+        }
+
+        $storeIds = $this->getStoreIds($input);
+
+        $output->writeln($this->decorateOperationAnnouncementMessage('Clearing indexing queue for {{target}}', $storeIds));
+
+        try {
+            $this->clearQueue($storeIds);
+        } catch (\Exception $e) {
+            $this->output->writeln('<error>' . $e->getMessage() . '</error>');
+            return Cli::RETURN_FAILURE;
+        }
+
+        $output->writeln('<info>Indexing queue cleared successfully!</info>');
+        return Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * Confirm the clear operation as it's destructive
+     *
+     * @return bool
+     */
+    protected function confirmClearOperation(): bool
+    {
+        $this->output->writeln('<fg=red>WARNING:</fg=red> This will clear all pending indexing jobs from the queue for the specified store(s). This action cannot be undone!');
+        return $this->confirmOperation(
+            'Indexing queue clear operation confirmed',
+            'Indexing queue clear operation cancelled',
+            true
+        );
+    }
+
+    /**
+     * Clear indexing queue for specified stores or all stores
+     *
+     * @param array $storeIds
+     * @throws NoSuchEntityException|LocalizedException
+     */
+    protected function clearQueue(array $storeIds = []): void
+    {
+        if (count($storeIds)) {
+            foreach ($storeIds as $storeId) {
+                $this->clearQueueForStore($storeId);
+            }
+        } else {
+            $this->clearQueueForAllStores();
+        }
+    }
+
+    /**
+     * Clear indexing queue for a specific store
+     *
+     * @param int $storeId
+     * @throws NoSuchEntityException
+     */
+    protected function clearQueueForStore(int $storeId): void
+    {
+        $storeName = $this->storeNameFetcher->getStoreName($storeId);
+        $this->output->writeln('<info>Clearing indexing queue for ' . $storeName . '...</info>');
+
+        try {
+            $this->clearQueueTableForStore($storeId);
+
+            $this->output->writeln('<info>✓ Indexing queue cleared for ' . $storeName . '</info>');
+        } catch (\Exception $e) {
+            $this->output->writeln('<error>✗ Failed to clear indexing queue for ' . $storeName . ': ' . $e->getMessage() . '</error>');
+        }
+    }
+
+    /**
+     * Clear indexing queue for all stores
+     *
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
+    protected function clearQueueForAllStores(): void
+    {
+        $connection = $this->jobResourceModel->getConnection();
+        $connection->truncateTable($this->jobResourceModel->getMainTable());
+    }
+
+    /**
+     * Clear the queue for a specific store (2 different approaches)
+     * Filters jobs by store_id in the JSON data field and deletes them
+     *
+     * @param int $storeId
+     * @throws \Exception
+     */
+    protected function clearQueueTableForStore(int $storeId): void
+    {
+        try {
+            // Use JSON_EXTRACT to filter by store_id in the data field
+            // This assumes MySQL 5.7+ or MariaDB 10.2+ for JSON support
+            $connection = $this->jobResourceModel->getConnection();
+            $mainTable = $this->jobResourceModel->getMainTable();
+
+            $select = $connection->select()
+                ->from($mainTable, ['job_id'])
+                ->where('JSON_EXTRACT(data, "$.storeId") = ?', $storeId);
+
+            $jobIds = $connection->fetchCol($select);
+
+            if (empty($jobIds)) {
+                $this->output->writeln('<comment>No jobs found for store ID ' . $storeId . '</comment>');
+                return;
+            }
+
+            // Delete the filtered jobs
+            $deletedCount = $connection->delete(
+                $mainTable,
+                ['job_id IN (?)' => $jobIds]
+            );
+
+            $this->output->writeln('<info>Deleted ' . $deletedCount . ' jobs for store ID ' . $storeId . '</info>');
+
+        } catch (\Exception $e) {
+            // Fallback method if JSON_EXTRACT is not supported
+            $this->output->writeln('<comment>JSON filtering not supported by database, using fallback method...</comment>');
+            $this->clearQueueTableForStoreFallback($storeId);
+        }
+    }
+
+    /**
+     * Fallback method for clearing queue by store when JSON filtering is not supported
+     * Loads all jobs and filters them in PHP
+     *
+     * @param int $storeId
+     * @throws \Exception
+     */
+    protected function clearQueueTableForStoreFallback(int $storeId): void
+    {
+        try {
+            $connection = $this->jobResourceModel->getConnection();
+            $mainTable = $this->jobResourceModel->getMainTable();
+
+            // Get all jobs and filter by store_id in PHP
+            $select = $connection->select()
+                ->from($mainTable, ['job_id', 'data'])
+                ->where('data IS NOT NULL');
+
+            $jobs = $connection->fetchAll($select);
+            $jobsToDelete = [];
+
+            foreach ($jobs as $job) {
+                $data = json_decode($job['data'], true);
+                if (isset($data['storeId']) && $data['storeId'] == $storeId) {
+                    $jobsToDelete[] = $job['job_id'];
+                }
+            }
+
+            if (empty($jobsToDelete)) {
+                $this->output->writeln('<comment>No jobs found for store ID ' . $storeId . ' (fallback method)</comment>');
+                return;
+            }
+
+            // Delete the filtered jobs
+            $deletedCount = $connection->delete(
+                $mainTable,
+                ['job_id IN (?)' => $jobsToDelete]
+            );
+
+            $this->output->writeln('<info>Deleted ' . $deletedCount . ' jobs for store ID ' . $storeId . ' (fallback method)</info>');
+
+        } catch (\Exception $e) {
+            // Safe: $storeId is cast to int, exception messages are internal.
+            // phpcs:ignore
+            throw new \Exception(sprintf('Failed to clear queue for store %d: %s', $storeId, $e->getMessage()));
+        }
+    }
+}
diff --git a/Console/Command/Indexer/ProcessQueueCommand.php b/Console/Command/Queue/ProcessQueueCommand.php
similarity index 89%
rename from Console/Command/Indexer/ProcessQueueCommand.php
rename to Console/Command/Queue/ProcessQueueCommand.php
index 13db37e56..43d6292c9 100644
--- a/Console/Command/Indexer/ProcessQueueCommand.php
+++ b/Console/Command/Queue/ProcessQueueCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command\Indexer;
+namespace Algolia\AlgoliaSearch\Console\Command\Queue;
 
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Model\Queue;
@@ -29,7 +29,7 @@ public function __construct(
 
     protected function getCommandName(): string
     {
-        return 'algolia:reindex:process_queue';
+        return 'algolia:queue:process';
     }
 
     protected function getCommandDescription(): string
@@ -40,7 +40,8 @@ protected function getCommandDescription(): string
     protected function configure(): void
     {
         $this->setName($this->getCommandName())
-            ->setDescription($this->getCommandDescription());
+            ->setDescription($this->getCommandDescription())
+            ->setAliases(['algolia:reindex:process_queue']);
 
         parent::configure();
     }
diff --git a/Console/Command/AbstractReplicaCommand.php b/Console/Command/Replica/AbstractReplicaCommand.php
similarity index 61%
rename from Console/Command/AbstractReplicaCommand.php
rename to Console/Command/Replica/AbstractReplicaCommand.php
index 41706d283..087cc2431 100644
--- a/Console/Command/AbstractReplicaCommand.php
+++ b/Console/Command/Replica/AbstractReplicaCommand.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command;
+namespace Algolia\AlgoliaSearch\Console\Command\Replica;
+
+use Algolia\AlgoliaSearch\Console\Command\AbstractStoreCommand;
 
 abstract class AbstractReplicaCommand extends AbstractStoreCommand
 {
diff --git a/Console/Command/ReplicaDeleteCommand.php b/Console/Command/Replica/ReplicaDeleteCommand.php
similarity index 98%
rename from Console/Command/ReplicaDeleteCommand.php
rename to Console/Command/Replica/ReplicaDeleteCommand.php
index 43805ea1d..f1fbcd2e6 100644
--- a/Console/Command/ReplicaDeleteCommand.php
+++ b/Console/Command/Replica/ReplicaDeleteCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command;
+namespace Algolia\AlgoliaSearch\Console\Command\Replica;
 
 use Algolia\AlgoliaSearch\Api\Console\ReplicaDeleteCommandInterface;
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
diff --git a/Console/Command/ReplicaDisableVirtualCommand.php b/Console/Command/Replica/ReplicaDisableVirtualCommand.php
similarity index 98%
rename from Console/Command/ReplicaDisableVirtualCommand.php
rename to Console/Command/Replica/ReplicaDisableVirtualCommand.php
index 47efc00f4..35971a226 100644
--- a/Console/Command/ReplicaDisableVirtualCommand.php
+++ b/Console/Command/Replica/ReplicaDisableVirtualCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command;
+namespace Algolia\AlgoliaSearch\Console\Command\Replica;
 
 use Algolia\AlgoliaSearch\Api\Console\ReplicaSyncCommandInterface;
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
@@ -151,7 +151,7 @@ protected function disableVirtualReplicasForAllStores(): void
     public function removeLegacyVirtualReplicaConfig(string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, int $scopeId = 0): void
     {
         $value = $this->scopeConfig->getValue(ConfigHelper::LEGACY_USE_VIRTUAL_REPLICA_ENABLED, $scope, $scopeId);
-        if (is_null($value)) {
+        if ($value === null) {
             return;
         }
         $this->output->writeln("<info>Removing legacy configuration " . ConfigHelper::LEGACY_USE_VIRTUAL_REPLICA_ENABLED . " for $scope scope" . ($scope != ScopeConfigInterface::SCOPE_TYPE_DEFAULT ? " (ID=$scopeId)" : "") . "</info>");
diff --git a/Console/Command/ReplicaRebuildCommand.php b/Console/Command/Replica/ReplicaRebuildCommand.php
similarity index 98%
rename from Console/Command/ReplicaRebuildCommand.php
rename to Console/Command/Replica/ReplicaRebuildCommand.php
index 387a95aeb..ff0691b78 100644
--- a/Console/Command/ReplicaRebuildCommand.php
+++ b/Console/Command/Replica/ReplicaRebuildCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command;
+namespace Algolia\AlgoliaSearch\Console\Command\Replica;
 
 use Algolia\AlgoliaSearch\Api\Console\ReplicaDeleteCommandInterface;
 use Algolia\AlgoliaSearch\Api\Console\ReplicaSyncCommandInterface;
diff --git a/Console/Command/ReplicaSyncCommand.php b/Console/Command/Replica/ReplicaSyncCommand.php
similarity index 98%
rename from Console/Command/ReplicaSyncCommand.php
rename to Console/Command/Replica/ReplicaSyncCommand.php
index c8e7b9b42..d80119ba2 100644
--- a/Console/Command/ReplicaSyncCommand.php
+++ b/Console/Command/Replica/ReplicaSyncCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Console\Command;
+namespace Algolia\AlgoliaSearch\Console\Command\Replica;
 
 use Algolia\AlgoliaSearch\Api\Console\ReplicaSyncCommandInterface;
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
diff --git a/Controller/Adminhtml/IndexingManager/Reindex.php b/Controller/Adminhtml/IndexingManager/Reindex.php
index f3214593d..060132c67 100644
--- a/Controller/Adminhtml/IndexingManager/Reindex.php
+++ b/Controller/Adminhtml/IndexingManager/Reindex.php
@@ -149,7 +149,7 @@ protected function reindexEntities(array $entities, ?array $storeIds = null, ?ar
                 $message = $this->storeNameFetcher->getStoreName($storeId) . " ";
                 $message .= "(" . $this->indexNameFetcher->getIndexName('_' . $entity, $storeId);
 
-                if (!is_null($entityIds)) {
+                if ($entityIds !== null) {
                     $recordLabel = count($entityIds) > 1 ? "records" : "record";
                     $message .= " - " . count($entityIds) . " " . $recordLabel;
                 } else {
diff --git a/Controller/Adminhtml/Landingpage/Duplicate.php b/Controller/Adminhtml/Landingpage/Duplicate.php
index 08c88a58a..fc39ece07 100644
--- a/Controller/Adminhtml/Landingpage/Duplicate.php
+++ b/Controller/Adminhtml/Landingpage/Duplicate.php
@@ -26,7 +26,7 @@ public function execute()
         $landingPage = $this->landingPageFactory->create();
         $landingPage->getResource()->load($landingPage, $landingPageId);
 
-        if (is_null($landingPage)) {
+        if ($landingPage === null) {
             $this->messageManager->addErrorMessage(__('This landing page does not exists.'));
 
             return $resultRedirect->setPath('*/*/');
diff --git a/Controller/Adminhtml/Landingpage/Edit.php b/Controller/Adminhtml/Landingpage/Edit.php
index a7f646381..e69616517 100644
--- a/Controller/Adminhtml/Landingpage/Edit.php
+++ b/Controller/Adminhtml/Landingpage/Edit.php
@@ -10,7 +10,7 @@ class Edit extends AbstractAction
     public function execute()
     {
         $landingPage = $this->initLandingPage();
-        if (is_null($landingPage)) {
+        if ($landingPage === null) {
             $this->messageManager->addErrorMessage(__('This landing page does not exists.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/Controller/Adminhtml/Query/Edit.php b/Controller/Adminhtml/Query/Edit.php
index 4b09a356c..d8088433e 100644
--- a/Controller/Adminhtml/Query/Edit.php
+++ b/Controller/Adminhtml/Query/Edit.php
@@ -10,7 +10,7 @@ class Edit extends AbstractAction
     public function execute()
     {
         $query = $this->initQuery();
-        if (is_null($query)) {
+        if ($query === null) {
             $this->messageManager->addErrorMessage(__('This query does not exists.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/Controller/Adminhtml/Query/Save.php b/Controller/Adminhtml/Query/Save.php
index d62dc6ccc..f67bdb395 100755
--- a/Controller/Adminhtml/Query/Save.php
+++ b/Controller/Adminhtml/Query/Save.php
@@ -120,7 +120,7 @@ public function execute()
                 $query->getResource()->save($query);
 
                 if (isset($data['algolia_merchandising_positions']) && $data['algolia_merchandising_positions'] != ''
-                    || !is_null($data['banner_image'])) {
+                    || $data['banner_image'] !== null) {
                     $this->manageQueryRules($query->getId(), $data);
                 }
 
@@ -168,7 +168,7 @@ private function manageQueryRules(int $queryId, array $data): void
         $bannerContent = $this->prepareBannerContent($data);
 
         foreach ($stores as $storeId) {
-            if (!$positions && is_null($bannerContent)) {
+            if (!$positions && $bannerContent === null) {
                 $this->merchandisingHelper->deleteQueryRule(
                     $storeId,
                     $queryId,
diff --git a/Controller/Adminhtml/Queue/View.php b/Controller/Adminhtml/Queue/View.php
index 3f9a38a65..c85586402 100644
--- a/Controller/Adminhtml/Queue/View.php
+++ b/Controller/Adminhtml/Queue/View.php
@@ -10,7 +10,7 @@ class View extends AbstractAction
     public function execute()
     {
         $job = $this->initJob();
-        if (is_null($job)) {
+        if ($job === null) {
             $this->messageManager->addErrorMessage(__('This job does not exist.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/Controller/Adminhtml/QueueArchive/View.php b/Controller/Adminhtml/QueueArchive/View.php
index 7672d9bf9..5704315eb 100644
--- a/Controller/Adminhtml/QueueArchive/View.php
+++ b/Controller/Adminhtml/QueueArchive/View.php
@@ -12,7 +12,7 @@ class View extends AbstractAction
     public function execute()
     {
         $job = $this->initJob();
-        if (is_null($job)) {
+        if ($job === null) {
             $this->messageManager->addErrorMessage(__('This job does not exist.'));
             /** @var Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/Helper/Adapter/FiltersHelper.php b/Helper/Adapter/FiltersHelper.php
index 66d034dd6..f69c538a7 100644
--- a/Helper/Adapter/FiltersHelper.php
+++ b/Helper/Adapter/FiltersHelper.php
@@ -59,7 +59,7 @@ public function getRequest()
     public function getPaginationFilters()
     {
         $paginationFilter = [];
-        $page = !is_null($this->request->getParam('page')) ?
+        $page = $this->request->getParam('page') !== null ?
             (int) $this->request->getParam('page') - 1 :
             0;
         $paginationFilter['page'] = $page;
@@ -84,7 +84,7 @@ public function getCategoryFilters($storeId)
             $categoryId = $category->getEntityId();
         }
 
-        if (!is_null($categoryId)) {
+        if ($categoryId !== null) {
             $categoryFilter['facetFilters'][] = 'categoryIds:' . $categoryId;
         }
 
@@ -234,13 +234,13 @@ public function getPriceFilters($storeId)
         $prices = [];
 
         // Instantsearch price facet compatibility
-        if (!is_null($this->request->getParam($paramPriceSlider))) {
+        if ($this->request->getParam($paramPriceSlider) !== null) {
             $pricesFilter = $this->request->getParam($paramPriceSlider);
             $prices = explode(':', $pricesFilter);
         }
 
         // Native Magento price facet compatibility
-        if (!$this->config->isInstantEnabled($storeId) && !is_null($this->request->getParam('price'))) {
+        if (!$this->config->isInstantEnabled($storeId) && $this->request->getParam('price') !== null) {
             $pricesFilter = $this->request->getParam('price');
             $prices = explode('-', $pricesFilter);
         }
diff --git a/Helper/ConfigHelper.php b/Helper/ConfigHelper.php
index a7d2e237e..a1ae1e13e 100755
--- a/Helper/ConfigHelper.php
+++ b/Helper/ConfigHelper.php
@@ -5,6 +5,7 @@
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
 use Algolia\AlgoliaSearch\Helper\Configuration\AutocompleteHelper;
 use Algolia\AlgoliaSearch\Helper\Configuration\InstantSearchHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper;
 use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
 use Algolia\AlgoliaSearch\Service\Serializer;
 use Magento\Cookie\Helper\Cookie as CookieHelper;
@@ -17,6 +18,7 @@
 use Magento\Framework\Locale\Currency;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Weee\Helper\Data as WeeeHelper;
 
 class ConfigHelper
 {
@@ -84,13 +86,6 @@ class ConfigHelper
     public const XML_PATH_IMAGE_HEIGHT = 'algoliasearch_images/image/height';
     public const XML_PATH_IMAGE_TYPE = 'algoliasearch_images/image/type';
 
-    // --- Indexing Queue / Cron --- //
-
-    public const IS_ACTIVE = 'algoliasearch_queue/queue/active';
-    public const USE_BUILT_IN_CRON = 'algoliasearch_queue/queue/use_built_in_cron';
-    public const NUMBER_OF_JOB_TO_RUN = 'algoliasearch_queue/queue/number_of_job_to_run';
-    public const RETRY_LIMIT = 'algoliasearch_queue/queue/number_of_retries';
-
     // --- Indexing Manager --- //
 
     public const ENABLE_INDEXING = 'algoliasearch_indexing_manager/algolia_indexing/enable_indexing';
@@ -123,6 +118,7 @@ class ConfigHelper
     public const REMOVE_IF_NO_RESULT = 'algoliasearch_advanced/advanced/remove_words_if_no_result';
     public const PARTIAL_UPDATES = 'algoliasearch_advanced/advanced/partial_update';
     public const CUSTOMER_GROUPS_ENABLE = 'algoliasearch_advanced/advanced/customer_groups_enable';
+    public const FPT_ENABLE = 'algoliasearch_advanced/advanced/fpt_enable';
     public const REMOVE_PUB_DIR_IN_URL = 'algoliasearch_advanced/advanced/remove_pub_dir_in_url';
     public const REMOVE_BRANDING = 'algoliasearch_advanced/advanced/remove_branding';
     public const IDX_PRODUCT_ON_CAT_PRODUCTS_UPD = 'algoliasearch_advanced/advanced/index_product_on_category_products_update';
@@ -132,6 +128,7 @@ class ConfigHelper
     public const BACKEND_RENDERING_ALLOWED_USER_AGENTS =
         'algoliasearch_advanced/advanced/backend_rendering_allowed_user_agents';
     public const NON_CASTABLE_ATTRIBUTES = 'algoliasearch_advanced/advanced/non_castable_attributes';
+    public const NUMBER_OF_ELEMENT_BY_PAGE = 'algoliasearch_advanced/advanced/number_of_element_by_page';
     public const MAX_RECORD_SIZE_LIMIT = 'algoliasearch_advanced/advanced/max_record_size_limit';
     public const ANALYTICS_REGION = 'algoliasearch_advanced/advanced/analytics_region';
     public const CONNECTION_TIMEOUT = 'algoliasearch_advanced/advanced/connection_timeout';
@@ -143,7 +140,6 @@ class ConfigHelper
 
     // Indexing Queue advanced settings
     public const ENHANCED_QUEUE_ARCHIVE = 'algoliasearch_advanced/queue/enhanced_archive';
-    public const NUMBER_OF_ELEMENT_BY_PAGE = 'algoliasearch_advanced/queue/number_of_element_by_page';
     public const ARCHIVE_LOG_CLEAR_LIMIT = 'algoliasearch_advanced/queue/archive_clear_limit';
 
     // --- Extra index settings --- //
@@ -177,7 +173,9 @@ public function __construct(
         protected GroupExcludedWebsiteRepositoryInterface               $groupExcludedWebsiteRepository,
         protected CookieHelper                                          $cookieHelper,
         protected AutocompleteHelper                                    $autocompleteConfig,
-        protected InstantSearchHelper                                   $instantSearchConfig
+        protected InstantSearchHelper                                   $instantSearchConfig,
+        protected QueueHelper                                           $queueHelper,
+        protected WeeeHelper                                            $weeeHelper
     )
     {}
 
@@ -315,11 +313,7 @@ public function getAlgoliaCookieDuration($storeId = null)
      */
     public function getProductAdditionalAttributes($storeId = null)
     {
-        $attributes = $this->serializer->unserialize($this->configInterface->getValue(
-            self::PRODUCT_ATTRIBUTES,
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        ));
+        $attributes = $this->getProductAttributesList($storeId);
 
         $facets = $this->serializer->unserialize($this->configInterface->getValue(
             self::FACETS,
@@ -525,6 +519,35 @@ public function useVirtualReplica(?int $storeId = null): bool
         ));
     }
 
+    /**
+     * @param $attributes
+     * @param $attributeName
+     * @return bool
+     */
+    public function isAttributeInList($attributes, $attributeName): bool
+    {
+        foreach ($attributes as $attr) {
+            if ($attr['attribute'] === $attributeName) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $storeId
+     * @return mixed
+     */
+    public function getProductAttributesList($storeId = null)
+    {
+        return $this->serializer->unserialize($this->configInterface->getValue(
+            self::PRODUCT_ATTRIBUTES,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        ));
+    }
+
     // --- Categories --- //
     /**
      * @param $storeId
@@ -943,46 +966,6 @@ public function getImageType($storeId = null)
         return $this->configInterface->getValue(self::XML_PATH_IMAGE_TYPE, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
-    // --- Indexing Queue / Cron --- //
-
-    /**
-     * @param $storeId
-     * @return mixed
-     */
-    public function getNumberOfJobToRun($storeId = null): int
-    {
-        $nbJobs = (int) $this->configInterface->getValue(self::NUMBER_OF_JOB_TO_RUN, ScopeInterface::SCOPE_STORE, $storeId);
-
-        return (int) max($nbJobs, 1);
-    }
-
-    /**
-     * @param $storeId
-     * @return int
-     */
-    public function getRetryLimit($storeId = null): int
-    {
-        return (int) $this->configInterface->getValue(self::RETRY_LIMIT, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
-    /**
-     * @param $storeId
-     * @return bool
-     */
-    public function isQueueActive($storeId = null): bool
-    {
-        return $this->configInterface->isSetFlag(self::IS_ACTIVE, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
-    /**
-     * @param $storeId
-     * @return bool
-     */
-    public function useBuiltInCron($storeId = null): bool
-    {
-        return $this->configInterface->isSetFlag(self::USE_BUILT_IN_CRON, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
     // --- Indexing Manager --- //
 
     /**
@@ -1193,6 +1176,16 @@ public function isCustomerGroupsEnabled($storeId = null): bool
         return $this->configInterface->isSetFlag(self::CUSTOMER_GROUPS_ENABLE, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
+    /**
+     * @param $storeId
+     * @return bool
+     */
+    public function isFptEnabled($storeId = null): bool
+    {
+        return $this->weeeHelper->isEnabled($storeId) &&
+            $this->configInterface->isSetFlag(self::FPT_ENABLE, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
     public function setCustomerGroupsEnabled(bool $val, ?string $scope = null, ?int $scopeId = null): void
     {
         $this->configWriter->save(
@@ -1310,6 +1303,15 @@ public function getNonCastableAttributes($storeId = null)
         return $nonCastableAttributes;
     }
 
+    /**
+     * @param $storeId
+     * @return int
+     */
+    public function getNumberOfElementByPage($storeId = null): int
+    {
+        return (int) $this->configInterface->getValue(self::NUMBER_OF_ELEMENT_BY_PAGE, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
     /**
      * @param $storeId
      * @return int
@@ -1386,16 +1388,7 @@ public function isProfilerEnabled(?int $storeId = null): bool
         return $this->configInterface->isSetFlag(self::PROFILER_ENABLED, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
-    // Indexing Queue advanced settings
-    /**
-     * @param $storeId
-     * @return int
-     */
-    public function getNumberOfElementByPage($storeId = null): int
-    {
-        return (int) $this->configInterface->getValue(self::NUMBER_OF_ELEMENT_BY_PAGE, ScopeInterface::SCOPE_STORE, $storeId);
-    }
-
+    // Indexing Queue advanced settingg
     /**
      * @param $storeId
      * @return int
@@ -1741,6 +1734,32 @@ public function getCacheTime($storeId = null)
      */
     public const LEGACY_USE_VIRTUAL_REPLICA_ENABLED = 'algoliasearch_instant/instant/use_virtual_replica';
 
+    // --- Indexing Queue / Cron --- //
+
+    /**
+     * @deprecated This constant has been moved to a domain specific config helper and will be removed in a future release
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::IS_ACTIVE
+     */
+    public const IS_ACTIVE = QueueHelper::IS_ACTIVE;
+
+    /**
+     * @deprecated This constant has been moved to a domain specific config helper and will be removed in a future release
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::USE_BUILT_IN_CRON
+     */
+    public const USE_BUILT_IN_CRON =  QueueHelper::USE_BUILT_IN_CRON;
+
+    /**
+     * @deprecated This constant has been moved to a domain specific config helper and will be removed in a future release
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::NUMBER_OF_JOB_TO_RUN
+     */
+    public const NUMBER_OF_JOB_TO_RUN =  QueueHelper::NUMBER_OF_JOB_TO_RUN;
+
+    /**
+     * @deprecated This constant has been moved to a domain specific config helper and will be removed in a future release
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::RETRY_LIMIT
+     */
+    public const RETRY_LIMIT =  QueueHelper::RETRY_LIMIT;
+
     // --- Indexing Manager --- //
 
     /**
@@ -2089,6 +2108,52 @@ public function hidePaginationInInstantSearchPage($storeId = null)
         return $this->instantSearchConfig->shouldHidePagination($storeId);
     }
 
+    // --- Indexing Queue / Cron --- //
+
+    /**
+     * @param $storeId
+     * @return bool
+     * @deprecated This method has been moved to the Queue config helper and will be removed in a future version
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::isQueueActive()
+     */
+    public function isQueueActive($storeId = null)
+    {
+        return $this->queueHelper->isQueueActive($storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return bool
+     * @deprecated This method has been moved to the Queue config helper and will be removed in a future version
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::useBuiltInCron()
+     */
+    public function useBuiltInCron($storeId = null)
+    {
+        return $this->queueHelper->useBuiltInCron($storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return bool
+     * @deprecated This method has been moved to the Queue config helper and will be removed in a future version
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::getNumberOfJobToRun()
+     */
+    public function getNumberOfJobToRun($storeId = null)
+    {
+        return $this->queueHelper->getNumberOfJobToRun($storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return bool
+     * @deprecated This method has been moved to the Queue config helper and will be removed in a future version
+     * @see \Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper::getRetryLimit()
+     */
+    public function getRetryLimit($storeId = null)
+    {
+        return $this->queueHelper->getRetryLimit($storeId);
+    }
+
     // --- Indexing Manager --- //
 
     /**
diff --git a/Helper/Configuration/NoticeHelper.php b/Helper/Configuration/NoticeHelper.php
index 1648bfadf..918795303 100644
--- a/Helper/Configuration/NoticeHelper.php
+++ b/Helper/Configuration/NoticeHelper.php
@@ -23,6 +23,7 @@ class NoticeHelper extends \Magento\Framework\App\Helper\AbstractHelper
         'getRecommendNotice',
         'getCookieConfigurationNotice',
         'getMultiApplicationIDsNotice',
+        'getPriceIndexingNotice',
     ];
 
     /** @var array[] */
@@ -99,7 +100,7 @@ protected function getQueueNotice()
                                 in approx. ' . $eta . '.
                                 You may want to <a href="' . $indexingQueuePageUrl . '">clear the queue</a> or <a href="' . $indexingQueueConfigUrl . '">configure indexing queue</a>.
                                 <br><br>
-                                Depending on your configuration set on "Advanced > Maximum number of records processed per indexing job" and if the jobs can be merged into batches, you can expect higher performances.
+                                Depending on your configuration set on "Advanced > Maximum number of records sent per indexing request" and if the jobs can be merged into batches, you can expect higher performances.
                                 <br><br>
                                 Find out more about Indexing Queue in <a href="https://www.algolia.com/doc/integration/magento-2/how-it-works/indexing-queue/?utm_source=magento&utm_medium=extension&utm_campaign=magento_2&utm_term=shop-owner&utm_content=doc-link" target="_blank">documentation</a>.';
         }
@@ -191,8 +192,8 @@ protected function getClickAnalyticsNotice()
         ];
     }
 
-   protected function getCookieConfigurationNotice()
-   {
+    protected function getCookieConfigurationNotice()
+    {
         $noticeContent = '';
         $selector = '';
         $method = 'after';
@@ -365,4 +366,33 @@ protected function getMultiApplicationIDsNotice(): void
             'message' => $this->formatNotice($noticeTitle, $noticeContent),
         ];
     }
+
+
+    /**
+     * This notice serves as a warning when user removes the price attribute from the attributes list but it's still present either in the sortings or in the facets
+     * @return void
+     */
+    protected function getPriceIndexingNotice(): void
+    {
+        $attributesToIndex = $this->configHelper->getProductAdditionalAttributes();
+        $attributesList = $this->configHelper->getProductAttributesList();
+
+        // we want to display the warning only if price is not present in the attribute list but is present somewhere else
+        if (!($this->configHelper->isAttributeInList($attributesToIndex, 'price')
+            && !$this->configHelper->isAttributeInList($attributesList, 'price'))
+        ) {
+            return;
+        }
+
+        $noticeTitle = 'Price attribute indexing';
+        $noticeContent = '<p>Price attribute has been removed from the product attributes list but is still present in the facets, sortings or custom rankings lists.</p>
+        <p>If you want to remove prices from the product records, you need to remove them from those lists as well.</p>
+        <p>If you want the prices to be included in the product records, you need to add the price attribute in the product attributes list in the "Products" section of the configuration.</p>';
+
+        $this->notices[] = [
+            'selector' => '.entry-edit',
+            'method' => 'before',
+            'message' => $this->formatNotice($noticeTitle, $noticeContent),
+        ];
+    }
 }
diff --git a/Helper/Configuration/QueueHelper.php b/Helper/Configuration/QueueHelper.php
new file mode 100644
index 000000000..a7b09b3fa
--- /dev/null
+++ b/Helper/Configuration/QueueHelper.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Helper\Configuration;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class QueueHelper
+{
+    public const IS_ACTIVE = 'algoliasearch_queue/queue/active';
+    public const USE_BUILT_IN_CRON = 'algoliasearch_queue/queue/use_built_in_cron';
+    public const NUMBER_OF_JOB_TO_RUN = 'algoliasearch_queue/queue/number_of_job_to_run';
+    public const RETRY_LIMIT = 'algoliasearch_queue/queue/number_of_retries';
+    public const USE_TMP_INDEX = 'algoliasearch_queue/queue/use_tmp_index';
+
+    public function __construct(
+        protected ScopeConfigInterface $configInterface,
+    ) {}
+
+    /**
+     * @param $storeId
+     * @return bool
+     */
+    public function isQueueActive($storeId = null)
+    {
+        return $this->configInterface->isSetFlag(self::IS_ACTIVE, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return bool
+     */
+    public function useBuiltInCron($storeId = null)
+    {
+        return $this->configInterface->isSetFlag(self::USE_BUILT_IN_CRON, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return mixed
+     */
+    public function getNumberOfJobToRun($storeId = null)
+    {
+        $nbJobs = (int)$this->configInterface->getValue(self::NUMBER_OF_JOB_TO_RUN, ScopeInterface::SCOPE_STORE, $storeId);
+
+        return max($nbJobs, 1);
+    }
+
+    /**
+     * @param $storeId
+     * @return int
+     */
+    public function getRetryLimit($storeId = null)
+    {
+        return (int)$this->configInterface->getValue(self::RETRY_LIMIT, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    /**
+     * @param $storeId
+     * @return bool
+     */
+    public function useTmpIndex($storeId = null)
+    {
+        return $this->isQueueActive($storeId) &&
+            $this->configInterface->isSetFlag(self::USE_TMP_INDEX, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+}
diff --git a/Helper/Data.php b/Helper/Data.php
index bf1d9fa16..4193b16aa 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -239,9 +239,9 @@ public function getIndexDataByStoreIds(): array
      */
     protected function buildIndexData(?StoreInterface $store = null): array
     {
-        $storeId = !is_null($store) ? $store->getStoreId() : null;
-        $currencyCode = !is_null($store) ?
-            $store->getCurrentCurrencyCode($storeId) :
+        $storeId = $store?->getStoreId();
+        $currencyCode = 
+            $store?->getCurrentCurrencyCode($storeId) ??
             $this->configHelper->getCurrencyCode();
 
         return [
@@ -250,7 +250,7 @@ protected function buildIndexData(?StoreInterface $store = null): array
             'indexName' => $this->getBaseIndexName($storeId),
             'priceKey' => '.' . $currencyCode . '.default',
             'facets' => $this->configHelper->getFacets($storeId),
-            'currencyCode' => $this->configHelper->getCurrencyCode($storeId),
+            'currencyCode' => $currencyCode,
             'maxValuesPerFacet' => (int) $this->configHelper->getMaxValuesPerFacet($storeId),
             'categorySeparator' => $this->configHelper->getCategorySeparator($storeId),
         ];
diff --git a/Helper/Entity/Product/CacheHelper.php b/Helper/Entity/Product/CacheHelper.php
new file mode 100644
index 000000000..1e30a4897
--- /dev/null
+++ b/Helper/Entity/Product/CacheHelper.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Helper\Entity\Product;
+
+use Algolia\AlgoliaSearch\Logger\AlgoliaLogger;
+use Algolia\AlgoliaSearch\Model\Cache\Product\IndexCollectionSize as Cache;
+
+class CacheHelper
+{
+    const ATTRIBUTES_TO_OBSERVE = ['status', 'visibility'];
+
+    public function __construct(
+        protected Cache $cache,
+        protected AlgoliaLogger $logger
+    ) {}
+
+    public function handleBulkAttributeChange(array $productIds, array $attributes, int $storeId)
+    {
+        if ($productIds
+            && array_intersect(array_keys($attributes), self::ATTRIBUTES_TO_OBSERVE)) {
+            $this->logger->info(sprintf("Clearing product index collection cache on store ID %d for attributes: %s", $storeId, join(',', array_keys($attributes))));
+            $this->cache->clear($storeId ?: null);
+        }
+    }
+}
diff --git a/Helper/Entity/Product/PriceManager/ProductWithChildren.php b/Helper/Entity/Product/PriceManager/ProductWithChildren.php
index b929edd97..300d908de 100755
--- a/Helper/Entity/Product/PriceManager/ProductWithChildren.php
+++ b/Helper/Entity/Product/PriceManager/ProductWithChildren.php
@@ -69,6 +69,11 @@ protected function getMinMaxPrices(Product $product, $withTax, $subProducts, $cu
 
                 $price     = $minPrice ?? $this->getTaxPrice($product, $finalPrice, $withTax);
                 $basePrice = $this->getTaxPrice($product, $basePrice, $withTax);
+
+                if ($this->configHelper->isFptEnabled($subProduct->getStoreId())) {
+                    $basePrice += $this->weeeTax->getWeeeAmount($subProduct);
+                }
+
                 $min = min($min, $price);
                 $original = min($original, $basePrice);
                 $max = max($max, $price);
diff --git a/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php b/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php
index 4c5883b1c..3432a57ad 100755
--- a/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php
+++ b/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php
@@ -16,6 +16,7 @@
 use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Weee\Model\Tax as WeeeTax;
 use Magento\Tax\Model\Config as TaxConfig;
 
 abstract class ProductWithoutChildren
@@ -40,6 +41,10 @@ abstract class ProductWithoutChildren
      * @var TaxHelper
      */
     protected $taxHelper;
+    /**
+     * @var WeeeTax
+     */
+    protected $weeeTax;
     /**
      * @var Rule
      */
@@ -77,6 +82,7 @@ abstract class ProductWithoutChildren
      * @param PriceCurrencyInterface $priceCurrency
      * @param CatalogHelper $catalogHelper
      * @param TaxHelper $taxHelper
+     * @param WeeeTax $weeeTax
      * @param Rule $rule
      * @param ProductFactory $productloader
      * @param ScopedProductTierPriceManagementInterface $productTierPrice
@@ -89,6 +95,7 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         CatalogHelper $catalogHelper,
         TaxHelper $taxHelper,
+        WeeeTax $weeeTax,
         Rule $rule,
         ProductFactory $productloader,
         ScopedProductTierPriceManagementInterface $productTierPrice,
@@ -100,6 +107,7 @@ public function __construct(
         $this->priceCurrency = $priceCurrency;
         $this->catalogHelper = $catalogHelper;
         $this->taxHelper = $taxHelper;
+        $this->weeeTax = $weeeTax;
         $this->rule = $rule;
         $this->productloader = $productloader;
         $this->productTierPrice = $productTierPrice;
@@ -146,6 +154,9 @@ public function addPriceData($customData, Product $product, $subProducts): array
             foreach ($currencies as $currencyCode) {
                 $this->customData[$field][$currencyCode] = [];
                 $price = $product->getPrice();
+                if ($this->configHelper->isFptEnabled($product->getStoreId())) {
+                    $price += $this->weeeTax->getWeeeAmount($product);
+                }
                 if ($currencyCode !== $this->baseCurrencyCode) {
                     $price = $this->convertPrice($price, $currencyCode);
                 }
@@ -257,7 +268,11 @@ protected function getSpecialPrice(Product $product, $currencyCode, $withTax, $s
             $specialPrices[$groupId] = [];
             $specialPrices[$groupId][] = $this->getRulePrice($groupId, $product, $subProducts);
             // The price with applied catalog rules
-            $specialPrices[$groupId][] = $product->getFinalPrice(); // The product's special price
+            $finalPrice = $product->getFinalPrice(); // The product's special price
+            if ($this->configHelper->isFptEnabled($product->getStoreId())) {
+                $finalPrice += $this->weeeTax->getWeeeAmount($product);
+            }
+            $specialPrices[$groupId][] = $finalPrice;
             $specialPrices[$groupId] = array_filter($specialPrices[$groupId], fn($price) => $price > 0);
             $specialPrice[$groupId] = false;
             if ($specialPrices[$groupId] && $specialPrices[$groupId] !== []) {
diff --git a/Helper/MathHelper.php b/Helper/MathHelper.php
new file mode 100644
index 000000000..a38f3faca
--- /dev/null
+++ b/Helper/MathHelper.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Helper;
+
+class MathHelper
+{
+    /**
+     * @param array $values
+     * @return float
+     */
+    static public function getAverage(array $values): float
+    {
+        if (empty($values)) {
+            return 0.00;
+        }
+
+        return round(array_sum(array_values($values)) / count($values), 2);
+    }
+
+    /**
+     * @param array $values
+     * @return float
+     */
+    static public function getSampleStandardDeviation(array $values): float
+    {
+        if (count($values) <= 1) {
+            return 0.0;
+        }
+
+        $average = self::getAverage($values);
+
+        $sum = 0;
+        foreach ($values as $value) {
+            $sum += pow($value - $average, 2);
+        }
+
+        return round(sqrt($sum / (count($values) - 1)), 2);
+    }
+}
diff --git a/Helper/MerchandisingHelper.php b/Helper/MerchandisingHelper.php
index e8bd00882..a31f14e58 100755
--- a/Helper/MerchandisingHelper.php
+++ b/Helper/MerchandisingHelper.php
@@ -53,11 +53,11 @@ public function saveQueryRule(int    $storeId,
             ],
         ];
 
-        if (!is_null($query) && $query != '') {
+        if ($query !== null && $query != '') {
             $condition['pattern'] = $query;
         }
 
-        if (!is_null($banner)) {
+        if ($banner !== null) {
             $rule['consequence']['userData']['banner'] = $banner;
         }
 
diff --git a/Model/Cache/Product/IndexCollectionSize.php b/Model/Cache/Product/IndexCollectionSize.php
new file mode 100644
index 000000000..138cadd11
--- /dev/null
+++ b/Model/Cache/Product/IndexCollectionSize.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Model\Cache\Product;
+
+use Algolia\AlgoliaSearch\Model\Cache\Type\Indexer;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\CacheInterface;
+
+class IndexCollectionSize
+{
+    const NOT_FOUND = -1;
+
+    public function __construct(
+        protected CacheInterface $cache,
+        protected StateInterface $state,
+        protected TypeListInterface $typeList
+    ) {}
+
+    public function get(int $storeId): int
+    {
+        if (!$this->isCacheAvailable()) {
+            return self::NOT_FOUND;
+        }
+
+        /** @var string|false $data */
+        $data = $this->cache->load($this->getCacheKey($storeId));
+        if ($data === false) {
+            return self::NOT_FOUND;
+        }
+
+        return (int) $data;
+    }
+
+    public function set(int $storeId, int $value, ?int $ttl = null): void
+    {
+        if ($this->isCacheAvailable()) {
+            $this->cache->save($value, $this->getCacheKey($storeId), [Indexer::CACHE_TAG], $ttl);
+        }
+    }
+
+    protected function remove(int $storeId): void
+    {
+        $this->cache->remove($this->getCacheKey($storeId));
+    }
+
+    public function isCacheAvailable(): bool
+    {
+        return $this->state->isEnabled(Indexer::TYPE_IDENTIFIER)
+            && !array_key_exists(Indexer::TYPE_IDENTIFIER, $this->typeList->getInvalidated());
+    }
+
+    protected function getCacheKey(int $storeId): string
+    {
+        return sprintf('%s_%s_%d', Indexer::TYPE_IDENTIFIER, 'product', $storeId);
+    }
+
+    public function clear(?int $storeId = null): void
+    {
+        if ($storeId === null) {
+            $this->typeList->invalidate(Indexer::TYPE_IDENTIFIER);
+            $this->typeList->cleanType(Indexer::TYPE_IDENTIFIER);
+        }
+        else {
+            $this->remove($storeId);
+        }
+    }
+}
diff --git a/Model/Cache/Type/Indexer.php b/Model/Cache/Type/Indexer.php
new file mode 100644
index 000000000..dc434a66a
--- /dev/null
+++ b/Model/Cache/Type/Indexer.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Model\Cache\Type;
+
+use Magento\Framework\App\Cache\Type\FrontendPool;
+use Magento\Framework\Cache\Frontend\Decorator\TagScope;
+
+class Indexer extends TagScope {
+    const TYPE_IDENTIFIER = 'algolia_indexer';
+    const CACHE_TAG = 'ALGOLIA_INDEXER';
+
+    public function __construct(FrontendPool $cacheFrontendPool)
+    {
+        parent::__construct(
+            $cacheFrontendPool->get(self::TYPE_IDENTIFIER),
+            self::CACHE_TAG
+        );
+    }
+}
diff --git a/Model/Indexer/Product.php b/Model/Indexer/Product.php
index 860c8947e..fb3155fb8 100755
--- a/Model/Indexer/Product.php
+++ b/Model/Indexer/Product.php
@@ -2,9 +2,8 @@
 
 namespace Algolia\AlgoliaSearch\Model\Indexer;
 
+use Algolia\AlgoliaSearch\Api\Processor\BatchQueueProcessorInterface;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
-use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor as ProductBatchQueueProcessor;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -16,34 +15,43 @@ class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Fr
     public function __construct(
         protected StoreManagerInterface $storeManager,
         protected ConfigHelper $configHelper,
-        protected ProductBatchQueueProcessor $productBatchQueueProcessor
+        protected BatchQueueProcessorInterface $productBatchQueueProcessor
     ) {}
 
     /**
-     * @throws NoSuchEntityException
+     * {@inheritdoc}
      */
-    public function execute($productIds)
+    public function execute($ids): void
     {
         foreach (array_keys($this->storeManager->getStores()) as $storeId) {
-            $this->productBatchQueueProcessor->processBatch($storeId, $productIds);
+            $this->productBatchQueueProcessor->processBatch($storeId, $ids);
         }
     }
 
-    public function executeFull()
+    /**
+     * {@inheritdoc}
+     */
+    public function executeFull(): void
     {
         if (!$this->configHelper->isProductsIndexerEnabled()) {
             return;
         }
 
-        $this->execute(null);
+        $this->execute([]);
     }
 
-    public function executeList(array $ids)
+    /**
+     * {@inheritdoc}
+     */
+    public function executeList(array $ids): void
     {
         $this->execute($ids);
     }
 
-    public function executeRow($id)
+    /**
+     * {@inheritdoc}
+     */
+    public function executeRow($id): void
     {
         $this->execute([$id]);
     }
diff --git a/Model/Job.php b/Model/Job.php
index 8661dc56f..69205ab38 100644
--- a/Model/Job.php
+++ b/Model/Job.php
@@ -183,7 +183,7 @@ public function getStatus(): string
     {
         $status = JobInterface::STATUS_PROCESSING;
 
-        if (is_null($this->getPid())) {
+        if ($this->getPid() === null) {
             $status = JobInterface::STATUS_NEW;
         }
 
diff --git a/Model/Observer/CatalogPermissions/CategoryPermissions.php b/Model/Observer/CatalogPermissions/CategoryPermissions.php
index 01f1b3c82..78629b579 100644
--- a/Model/Observer/CatalogPermissions/CategoryPermissions.php
+++ b/Model/Observer/CatalogPermissions/CategoryPermissions.php
@@ -39,9 +39,9 @@ public function execute(Observer $observer)
             $customerGroupId = $customerGroup->getCustomerGroupId();
 
             $isVisible = (int) $this->permissionsFactory->getCatalogPermissionsHelper()->isAllowedCategoryView($storeId, $customerGroupId);
-            if (!is_null($category->getData('shared_catalog_permission_' . $customerGroupId))) {
+            if ($category->getData('shared_catalog_permission_' . $customerGroupId) !== null) {
                 $isVisible = (int) $category->getData('shared_catalog_permission_' . $customerGroupId);
-            } elseif (!is_null($category->getData('customer_group_permission_' . $customerGroupId))) {
+            } elseif ($category->getData('customer_group_permission_' . $customerGroupId) !== null) {
                 $isVisible = (int) $category->getData('customer_group_permission_' . $customerGroupId);
             }
 
diff --git a/Model/Observer/CatalogPermissions/ProductPermissions.php b/Model/Observer/CatalogPermissions/ProductPermissions.php
index 799218ff6..40f27f56f 100644
--- a/Model/Observer/CatalogPermissions/ProductPermissions.php
+++ b/Model/Observer/CatalogPermissions/ProductPermissions.php
@@ -39,9 +39,9 @@ public function execute(Observer $observer)
             $customerGroupId = $customerGroup->getCustomerGroupId();
 
             $isVisible  = (int) $this->permissionsFactory->getCatalogPermissionsHelper()->isAllowedCategoryView($storeId, $customerGroupId);
-            if (!is_null($product->getData('shared_catalog_permission_' . $customerGroupId))) {
+            if ($product->getData('shared_catalog_permission_' . $customerGroupId) !== null) {
                 $isVisible = (int) $product->getData('shared_catalog_permission_' . $customerGroupId);
-            } elseif (!is_null($product->getData('customer_group_permission_' . $customerGroupId))) {
+            } elseif ($product->getData('customer_group_permission_' . $customerGroupId) !== null) {
                 $isVisible = (int) $product->getData('customer_group_permission_' . $customerGroupId);
             }
 
diff --git a/Model/ResourceModel/LandingPage.php b/Model/ResourceModel/LandingPage.php
index aba5e357c..898557bcb 100644
--- a/Model/ResourceModel/LandingPage.php
+++ b/Model/ResourceModel/LandingPage.php
@@ -136,12 +136,12 @@ public function checkUrlRewriteTable($urlKey, $storeId = null, $landingPageId =
             ->where('request_path = ?', $urlKey);
 
         // Only check a particular store if specified
-        if (!is_null($storeId) && $storeId != 0) {
+        if ($storeId) {
             $select->where('store_id = ?', $storeId);
         }
 
         // Handle the already existing url rewrite for the landing page
-        if (!is_null($landingPageId) && $landingPageId != 0) {
+        if ($landingPageId) {
             $select->where('!(entity_type = "landing-page" AND entity_id = ?)', $landingPageId);
         }
 
diff --git a/Model/ResourceModel/Query.php b/Model/ResourceModel/Query.php
index dee152967..b63a3f6e9 100644
--- a/Model/ResourceModel/Query.php
+++ b/Model/ResourceModel/Query.php
@@ -29,12 +29,12 @@ public function checkQueryUnicity($queryText, $storeId = null, $queryId = null)
             ->where('query_text = ?', $queryText);
 
         // Only check a particular store if specified
-        if (!is_null($storeId) && $storeId != 0) {
+        if ($storeId !== null && $storeId != 0) {
             $select->where('store_id = ?', $storeId);
         }
 
         // Handle the already existing query text for the query
-        if (!is_null($queryId) && $queryId != 0) {
+        if ($queryId !== null && $queryId != 0) {
             $select->where('query_id != ?', $queryId);
         }
 
diff --git a/Plugin/Cache/CacheCleanBulkAttributePlugin.php b/Plugin/Cache/CacheCleanBulkAttributePlugin.php
new file mode 100644
index 000000000..322f67b78
--- /dev/null
+++ b/Plugin/Cache/CacheCleanBulkAttributePlugin.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Plugin\Cache;
+
+use Algolia\AlgoliaSearch\Helper\Entity\Product\CacheHelper;
+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save;
+use Magento\Catalog\Helper\Product\Edit\Action\Attribute;
+use Magento\Framework\Controller\Result\Redirect;
+
+class CacheCleanBulkAttributePlugin
+{
+    public function __construct(
+        protected Attribute $attributeHelper,
+        protected CacheHelper $cacheHelper
+    ) {}
+
+   /** In the event that the product_action_attribute.update consumer does not handle this change and update occurs in process
+    *  then this plugin will preemptively clear the cache
+    */
+    public function afterExecute(
+        Save $subject,
+        Redirect $result
+    ): Redirect
+    {
+        $this->cacheHelper->handleBulkAttributeChange(
+            $this->attributeHelper->getProductIds(),
+            $subject->getRequest()->getParam('attributes', []),
+            $this->attributeHelper->getSelectedStoreId()
+        );
+
+        return $result;
+    }
+}
diff --git a/Plugin/Cache/CacheCleanProductPlugin.php b/Plugin/Cache/CacheCleanProductPlugin.php
new file mode 100644
index 000000000..c57a9a8b3
--- /dev/null
+++ b/Plugin/Cache/CacheCleanProductPlugin.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Plugin\Cache;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Entity\Product\CacheHelper;
+use Algolia\AlgoliaSearch\Model\Cache\Product\IndexCollectionSize as Cache;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Action;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+
+class CacheCleanProductPlugin
+{
+    protected array $originalData = [];
+
+    public function __construct(
+        protected Cache $cache,
+        protected ConfigHelper $configHelper,
+        protected CacheHelper $cacheHelper
+    ) { }
+
+    public function beforeSave(ProductResource $subject, Product $product): void
+    {
+        $this->originalData[$product->getSku()] = $product->getOrigData();
+    }
+
+    public function afterSave(ProductResource $subject, ProductResource $result, Product $product): ProductResource
+    {
+        $original = $this->originalData[$product->getSku()] ?? [];
+
+        // In case of a product duplication
+        if (empty($original)) {
+            return $result;
+        }
+
+        $storeId = $product->getStoreId();
+
+        $shouldClearCache =
+            $this->isEligibleNewProduct($product)
+            || $this->hasEnablementChanged($original, $product->getData())
+            || $this->hasVisibilityChanged($original, $product->getData(), $storeId)
+            || $this->hasStockChanged($original, $product->getData(), $storeId);
+
+        if ($shouldClearCache) {
+            $this->cache->clear($storeId ?: null);
+        }
+
+        return $result;
+    }
+
+    public function afterDelete(ProductResource $subject, ProductResource $result): ProductResource
+    {
+        $this->cache->clear();
+        return $result;
+    }
+
+    /**
+     *  Called on mass action "Change Status"
+     *  Called on "Update attributes" if `product_action_attribute.update` consumer is running
+     */
+    public function afterUpdateAttributes(Action $subject, Action $result, array $productIds, array $attributes, int $storeId): Action
+    {
+        $this->cacheHelper->handleBulkAttributeChange($productIds, $attributes, $storeId);
+        return $result;
+    }
+
+    protected function isEligibleNewProduct(Product $product): bool
+    {
+        $storeId = $product->getStoreId();
+        return $product->isObjectNew()
+            && $product->getStatus() === Status::STATUS_ENABLED
+            && $this->configHelper->includeNonVisibleProductsInIndex($storeId)
+                || $product->isVisibleInSiteVisibility()
+            && $this->configHelper->getShowOutOfStock($storeId)
+                || $product->isInStock();
+    }
+
+    protected function hasEnablementChanged(array $orig, array $new): bool
+    {
+        $key = 'status';
+        return $orig[$key] !== $new[$key];
+    }
+
+    protected function hasVisibilityChanged(array $orig, array $new, ?int $storeId = null): bool
+    {
+        if ($this->configHelper->includeNonVisibleProductsInIndex($storeId)) {
+            return false;
+        }
+
+        $key = 'visibility';
+        return $this->isVisible($orig[$key]) !== $this->isVisible($new[$key]);
+    }
+
+    /**
+     * Do not rely on this data point only
+     * TODO revaluate with MSI support
+     */
+    protected function hasStockChanged(array $orig, array $new, int $storeId): bool
+    {
+        if ($this->configHelper->getShowOutOfStock($storeId)) {
+            return false;
+        }
+
+        $key = 'quantity_and_stock_status';
+        $oldStock = $orig[$key];
+        $newStock = $new[$key];
+
+        // In case of a product duplication on second save (for some reason, Magento returns a different data structure in that case).
+        if (!is_array($newStock)) {
+            $newStock = ['is_in_stock' => $newStock];
+        }
+
+        return $this->canCompareValues($oldStock, $newStock, 'is_in_stock')
+            && (bool) $oldStock['is_in_stock'] !== (bool) $newStock['is_in_stock']
+            || $this->canCompareValues($oldStock, $newStock, 'qty')
+            && $this->hasStock($oldStock['qty']) !== $this->hasStock($newStock['qty']);
+    }
+
+    protected function canCompareValues(array $orig, array $new, string $key): bool
+    {
+        return array_key_exists($key, $orig) && array_key_exists($key, $new);
+    }
+
+    protected function isVisible(int $visibility): bool
+    {
+        return $visibility !== Visibility::VISIBILITY_NOT_VISIBLE;
+    }
+
+    /*
+     * Reduce numeric to comparable boolean
+     */
+    protected function hasStock(int $qty): bool
+    {
+        return $qty > 0;
+    }
+}
diff --git a/README.md b/README.md
index c5bf56c57..eaead7ab1 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Algolia Search & Discovery extension for Magento 2
 ==================================================
 
-![Latest version](https://img.shields.io/badge/latest-3.16.1-green)
+![Latest version](https://img.shields.io/badge/latest-3.17.0-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.7+-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.1%2C8.2%2C8.3%2C8.4-blue)
diff --git a/Service/AlgoliaConnector.php b/Service/AlgoliaConnector.php
index cce5c48cc..5b5e46c3c 100755
--- a/Service/AlgoliaConnector.php
+++ b/Service/AlgoliaConnector.php
@@ -135,7 +135,7 @@ protected function addAlgoliaUserAgent(int $storeId = self::ALGOLIA_DEFAULT_SCOP
      */
     public function getClient(?int $storeId = self::ALGOLIA_DEFAULT_SCOPE): SearchClient
     {
-        if (is_null($storeId)) {
+        if ($storeId === null) {
             $storeId = self::ALGOLIA_DEFAULT_SCOPE;
         }
 
@@ -477,7 +477,7 @@ protected function setLastOperationInfo(IndexOptionsInterface $indexOptions, arr
         $this->lastUsedIndexName = $indexName;
         $this->lastTaskId = $response[self::ALGOLIA_API_TASK_ID] ?? null;
 
-        if (!is_null($storeId)) {
+        if ($storeId !== null) {
             $this->lastTaskInfoByStore[$storeId] = [
                 'indexName' => $indexName,
                 'taskId' => $response[self::ALGOLIA_API_TASK_ID] ?? null
@@ -642,16 +642,16 @@ public function clearIndex(IndexOptionsInterface $indexOptions): void
      */
     public function waitLastTask(?int $storeId = null, ?string $lastUsedIndexName = null, ?int $lastTaskId = null): void
     {
-        if (is_null($lastUsedIndexName)) {
-            if (!is_null($storeId) && isset($this->lastTaskInfoByStore[$storeId])) {
+        if ($lastUsedIndexName === null) {
+            if ($storeId !== null && isset($this->lastTaskInfoByStore[$storeId])) {
                 $lastUsedIndexName = $this->lastTaskInfoByStore[$storeId]['indexName'];
             } elseif (isset($this->lastUsedIndexName)){
                 $lastUsedIndexName = $this->lastUsedIndexName;
             }
         }
 
-        if (is_null($lastTaskId)) {
-            if (!is_null($storeId) && isset($this->lastTaskInfoByStore[$storeId])) {
+        if ($lastTaskId === null) {
+            if ($storeId !== null && isset($this->lastTaskInfoByStore[$storeId])) {
                 $lastTaskId = $this->lastTaskInfoByStore[$storeId]['taskId'];
             } elseif (isset($this->lastTaskId)){
                 $lastTaskId = $this->lastTaskId;
@@ -662,7 +662,7 @@ public function waitLastTask(?int $storeId = null, ?string $lastUsedIndexName =
             return;
         }
 
-        if (is_null($storeId)) {
+        if ($storeId === null) {
             $storeId = self::ALGOLIA_DEFAULT_SCOPE;
         }
 
@@ -894,7 +894,7 @@ public function getLastTaskId(?int $storeId = null): int|null
     {
         $lastTaskId = null;
 
-        if (!is_null($storeId) && isset($this->lastTaskInfoByStore[$storeId])) {
+        if ($storeId !== null && isset($this->lastTaskInfoByStore[$storeId])) {
             $lastTaskId = $this->lastTaskInfoByStore[$storeId]['taskId'];
         } elseif (isset($this->lastTaskId)){
             $lastTaskId = $this->lastTaskId;
diff --git a/Service/Category/IndexBuilder.php b/Service/Category/IndexBuilder.php
index 66c8a5bd3..444342379 100644
--- a/Service/Category/IndexBuilder.php
+++ b/Service/Category/IndexBuilder.php
@@ -81,7 +81,7 @@ public function buildIndex(int $storeId, ?array $entityIds, ?array $options): vo
             return;
         }
 
-        if (!is_null($entityIds)) {
+        if ($entityIds !== null) {
             $this->rebuildEntityIds($storeId, $entityIds);
             return;
         }
diff --git a/Service/IndexOptionsBuilder.php b/Service/IndexOptionsBuilder.php
index 93c145807..06ccbd784 100644
--- a/Service/IndexOptionsBuilder.php
+++ b/Service/IndexOptionsBuilder.php
@@ -82,11 +82,11 @@ protected function build(IndexOptionsInterface $indexOptions): IndexOptionsInter
      */
     protected function computeIndexName(IndexOptionsInterface $indexOptions): ?string
     {
-        if (!is_null($indexOptions->getIndexName())) {
+        if ($indexOptions->getIndexName() !== null) {
             return $indexOptions->getIndexName();
         }
 
-        if (is_null($indexOptions->getIndexSuffix())) {
+        if ($indexOptions->getIndexSuffix() === null) {
             throw new AlgoliaException('Index suffix is mandatory in case no enforced index name is specified.');
         }
 
diff --git a/Service/Product/BatchQueueProcessor.php b/Service/Product/BatchQueueProcessor.php
index 8092608f2..c26ebeb8a 100644
--- a/Service/Product/BatchQueueProcessor.php
+++ b/Service/Product/BatchQueueProcessor.php
@@ -6,28 +6,31 @@
 use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
 use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper;
 use Algolia\AlgoliaSearch\Helper\Data;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
 use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
+use Algolia\AlgoliaSearch\Model\Cache\Product\IndexCollectionSize;
 use Algolia\AlgoliaSearch\Model\IndexMover;
 use Algolia\AlgoliaSearch\Model\IndicesConfigurator;
 use Algolia\AlgoliaSearch\Model\Queue;
 use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
 use Algolia\AlgoliaSearch\Service\Product\IndexBuilder as ProductIndexBuilder;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class BatchQueueProcessor implements BatchQueueProcessorInterface
 {
-    protected bool $areParentsLoaded = false;
-
     public function __construct(
         protected Data $dataHelper,
         protected ConfigHelper $configHelper,
         protected ProductHelper $productHelper,
+        protected QueueHelper $queueHelper,
         protected Queue $queue,
         protected DiagnosticsLogger $diag,
         protected AlgoliaCredentialsManager $algoliaCredentialsManager,
-        protected ProductIndexBuilder $productIndexBuilder
+        protected ProductIndexBuilder $productIndexBuilder,
+        protected IndexCollectionSize $indexCollectionSizeCache
     ){}
 
     /**
@@ -39,60 +42,104 @@ public function __construct(
      */
     public function processBatch(int $storeId, ?array $entityIds = null): void
     {
-        if ($this->dataHelper->isIndexingEnabled($storeId) === false) {
+        if (!$this->dataHelper->isIndexingEnabled($storeId)) {
             return;
         }
 
         if (!$this->algoliaCredentialsManager->checkCredentialsWithSearchOnlyAPIKey($storeId)) {
             $this->algoliaCredentialsManager->displayErrorMessage(self::class, $storeId);
-
             return;
         }
 
-        if ($entityIds && !$this->areParentsLoaded) {
-            $entityIds = array_unique(array_merge($entityIds, $this->productHelper->getParentProductIds($entityIds)));
-            $this->areParentsLoaded = true;
-        }
-
         $productsPerPage = $this->configHelper->getNumberOfElementByPage($storeId);
 
-        if (is_array($entityIds) && count($entityIds) > 0) {
-            foreach (array_chunk($entityIds, $productsPerPage) as $chunk) {
-                /** @uses ProductIndexBuilder::buildIndexList() */
-                $this->queue->addToQueue(
-                    ProductIndexBuilder::class,
-                    'buildIndexList',
-                    ['storeId' => $storeId, 'entityIds' => $chunk],
-                    count($chunk)
-                );
-            }
-
+        if (!empty($entityIds)) {
+            $this->handleDeltaIndex($entityIds, $storeId, $productsPerPage);
             return;
         }
 
-        $useTmpIndex = $this->configHelper->isQueueActive($storeId);
-        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex();
-        $collection = $this->productHelper->getProductCollectionQuery($storeId, $entityIds, $onlyVisible);
+        $useTmpIndex = $this->queueHelper->useTmpIndex($storeId);
+        $this->syncAlgoliaSettings($storeId, $useTmpIndex);
+
+        $this->handleFullIndex($storeId, $productsPerPage, $useTmpIndex);
 
-        $timerName = __METHOD__ . ' (Get product collection size)';
-        $this->diag->startProfiling($timerName);
-        $size = $collection->getSize();
-        $this->diag->stopProfiling($timerName);
+        if ($useTmpIndex) {
+            $this->moveTempIndex($storeId);
+        }
+    }
 
-        $pages = ceil($size / $productsPerPage);
+    /**
+     * @throws DiagnosticsException
+     */
+    protected function getCollectionSize(int $storeId, Collection $collection): int
+    {
+        $this->diag->startProfiling(__METHOD__);
+        $size = $this->indexCollectionSizeCache->get($storeId);
+        if ($size === IndexCollectionSize::NOT_FOUND) {
+            $size = $collection->getSize();
+            $this->indexCollectionSizeCache->set($storeId, $size);
+        }
+        $this->diag->stopProfiling(__METHOD__);
+        return $size;
+    }
 
+    protected function syncAlgoliaSettings(int $storeId, bool $useTmpIndex): void
+    {
         /** @uses IndicesConfigurator::saveConfigurationToAlgolia() */
         $this->queue->addToQueue(IndicesConfigurator::class, 'saveConfigurationToAlgolia', [
             'storeId' => $storeId,
             'useTmpIndex' => $useTmpIndex,
         ], 1, true);
+    }
+
+    /**
+     * @throws NoSuchEntityException
+     */
+    protected function moveTempIndex(int $storeId): void {
+        /** @uses IndexMover::moveIndexWithSetSettings() */
+        $this->queue->addToQueue(IndexMover::class, 'moveIndexWithSetSettings', [
+            'tmpIndexName' => $this->productHelper->getTempIndexName($storeId),
+            'indexName' => $this->productHelper->getIndexName($storeId),
+            'storeId' => $storeId,
+        ], 1, true);
+    }
+
+    protected function handleDeltaIndex(array $entityIds, int $storeId, int $productsPerPage): void
+    {
+        $entityIds = array_unique(array_merge($entityIds, $this->productHelper->getParentProductIds($entityIds)));
+
+        foreach (array_chunk($entityIds, $productsPerPage) as $i => $chunk) {
+            /** @uses ProductIndexBuilder::buildIndexList() */
+            $this->queue->addToQueue(
+                ProductIndexBuilder::class,
+                'buildIndexList',
+                [
+                    'storeId'   => $storeId,
+                    'entityIds' => $chunk,
+                    'options'   => [
+                        'page'        => $i + 1,
+                        'pageSize'    => $productsPerPage,
+                    ]
+                ],
+                count($chunk)
+            );
+        }
+    }
+
+    /**
+     * @throws DiagnosticsException
+     */
+    protected function handleFullIndex(int $storeId, int $productsPerPage, bool $useTmpIndex): void
+    {
+        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex();
+        $collection = $this->productHelper->getProductCollectionQuery($storeId, [], $onlyVisible);
+        $pages = ceil($this->getCollectionSize($storeId, $collection) / $productsPerPage);
         for ($i = 1; $i <= $pages; $i++) {
             $data = [
                 'storeId' => $storeId,
                 'options' => [
-                    'entityIds' => $entityIds,
-                    'page' => $i,
-                    'pageSize' => $productsPerPage,
+                    'page'        => $i,
+                    'pageSize'    => $productsPerPage,
                     'useTmpIndex' => $useTmpIndex,
                 ]
             ];
@@ -106,15 +153,6 @@ public function processBatch(int $storeId, ?array $entityIds = null): void
                 true
             );
         }
-
-        if ($useTmpIndex) {
-            /** @uses IndexMover::moveIndexWithSetSettings() */
-            $this->queue->addToQueue(IndexMover::class, 'moveIndexWithSetSettings', [
-                'tmpIndexName' => $this->productHelper->getTempIndexName($storeId),
-                'indexName' => $this->productHelper->getIndexName($storeId),
-                'storeId' => $storeId,
-            ], 1, true);
-        }
     }
 
     /**
diff --git a/Service/Product/IndexBuilder.php b/Service/Product/IndexBuilder.php
index 231f79459..a4950b3ba 100644
--- a/Service/Product/IndexBuilder.php
+++ b/Service/Product/IndexBuilder.php
@@ -3,6 +3,7 @@
 namespace Algolia\AlgoliaSearch\Service\Product;
 
 use Algolia\AlgoliaSearch\Api\Builder\UpdatableIndexBuilderInterface;
+use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
 use Algolia\AlgoliaSearch\Exception\ProductReindexingException;
 use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
@@ -86,71 +87,24 @@ public function buildIndexList(int $storeId, ?array $entityIds = null, ?array $o
      */
     public function buildIndex(int $storeId, ?array $entityIds, ?array $options): void
     {
-        if ($this->isIndexingEnabled($storeId) === false) {
+        if (!$this->isIndexingEnabled($storeId)) {
             return;
         }
 
-        if (!is_null($entityIds)) {
-            $this->rebuildEntityIds($storeId, $entityIds);
-            return;
-        }
+        $this->startEmulation($storeId);
 
         $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex($storeId);
-        $collection = $this->productHelper->getProductCollectionQuery($storeId, null, $onlyVisible);
+        $collection = $this->productHelper->getProductCollectionQuery($storeId, $entityIds, $onlyVisible);
+
         $this->buildIndexPage(
             $storeId,
             $collection,
-            $options['page'],
-            $options['pageSize'],
-            null,
-            $options['entityIds'],
-            $options['useTmpIndex']
+            $options['page'] ?? 1,
+            $options['pageSize'] ?? $this->configHelper->getNumberOfElementByPage($storeId),
+            $entityIds,
+            $options['useTmpIndex'] ?? false
         );
-    }
 
-    /**
-     * @param int $storeId
-     * @param string[] $productIds
-     * @return void
-     * @throws \Exception
-     */
-    protected function rebuildEntityIds(int $storeId, array $productIds): void
-    {
-        $this->startEmulation($storeId);
-        $this->logger->start('Indexing');
-        try {
-            $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex($storeId);
-            $collection = $this->productHelper->getProductCollectionQuery($storeId, $productIds, $onlyVisible);
-            $timerName = __METHOD__ . ' (Get product collection size)';
-            $this->logger->startProfiling($timerName);
-            $size = $collection->getSize();
-            $this->logger->stopProfiling($timerName);
-
-            if (!empty($productIds)) {
-                $size = max(count($productIds), $size);
-            }
-            $this->logger->log('Store ' . $this->logger->getStoreName($storeId) . ' collection size : ' . $size);
-            if ($size > 0) {
-                $pages = ceil($size / $this->configHelper->getNumberOfElementByPage());
-                $collection->clear();
-                $page = 1;
-                while ($page <= $pages) {
-                    $this->buildIndexPage(
-                        $storeId,
-                        $collection,
-                        $page,
-                        $this->configHelper->getNumberOfElementByPage(),
-                        null,
-                        $productIds
-                    );
-                    $page++;
-                }
-            }
-        } catch (\Exception $e) {
-            $this->stopEmulation();
-            throw $e;
-        }
-        $this->logger->stop('Indexing');
         $this->stopEmulation();
     }
 
@@ -186,42 +140,41 @@ public function deleteInactiveProducts($storeId): void
     }
 
     /**
-     * @param $storeId
-     * @param $collectionDefault
-     * @param $page
-     * @param $pageSize
-     * @param $emulationInfo
-     * @param $productIds
-     * @param $useTmpIndex
+     * @param int $storeId
+     * @param Collection $collection - collection to be paged
+     * @param int $page
+     * @param int $pageSize
+     * @param array|null $productIds - pre-batched product ids - if specified no paging will be applied
+     * @param bool|null $useTmpIndex
      * @return void
-     * @throws \Exception
+     * @throws AlgoliaException
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
      */
     protected function buildIndexPage(
-        $storeId,
-        $collectionDefault,
-        $page,
-        $pageSize,
-        $emulationInfo = null,
-        $productIds = null,
-        $useTmpIndex = false
+        int $storeId,
+        Collection $collection,
+        int $page,
+        int $pageSize,
+        ?array $productIds = null,
+        ?bool $useTmpIndex = false
     ): void
     {
         if ($this->isIndexingEnabled($storeId) === false) {
             return;
         }
 
-        $wrapperLogMessage = 'rebuildStoreProductIndexPage: ' . $this->logger->getStoreName($storeId) . ',
+        $wrapperLogMessage = 'Build products index page: ' . $this->logger->getStoreName($storeId) . ',
             page ' . $page . ',
             pageSize ' . $pageSize;
         $this->logger->start($wrapperLogMessage, true);
-        if ($emulationInfo === null) {
-            $this->startEmulation($storeId);
-        }
+
         $additionalAttributes = $this->configHelper->getProductAdditionalAttributes($storeId);
 
-        /** @var Collection $collection */
-        $collection = clone $collectionDefault;
-        $collection->setCurPage($page)->setPageSize($pageSize);
+        if (empty($productIds)) {
+            $collection->setCurPage($page)->setPageSize($pageSize);
+        }
+
         $collection->addCategoryIds();
         $collection->addUrlRewrite();
 
@@ -248,7 +201,7 @@ protected function buildIndexPage(
             collection page: ' . $page . ',
             pageSize: ' . $pageSize;
         $this->logger->start($logMessage);
-        $collection->load();
+        $collection->load(); // eliminate extra query to obtain count
         $this->logger->log('Loaded ' . count($collection) . ' products');
         $this->logger->stop($logMessage);
         $indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId, $useTmpIndex);
@@ -269,14 +222,6 @@ protected function buildIndexPage(
                 $this->logger->stop('REMOVE FROM ALGOLIA');
             }
         }
-        unset($indexData);
-        $collection->walk('clearInstance');
-        $collection->clear();
-        unset($collection);
-        if ($emulationInfo === null) {
-            $this->stopEmulation();
-        }
-
         $this->logger->stop($wrapperLogMessage, true);
     }
 
diff --git a/Service/Product/RecordBuilder.php b/Service/Product/RecordBuilder.php
index 5c4a59e92..f0a6a6831 100644
--- a/Service/Product/RecordBuilder.php
+++ b/Service/Product/RecordBuilder.php
@@ -123,7 +123,11 @@ public function buildRecord(DataObject $entity): array
         }
         $subProducts = $this->getSubProducts($product);
         $customData = $this->addAdditionalAttributes($customData, $additionalAttributes, $product, $subProducts);
-        $customData = $this->priceManager->addPriceDataByProductType($customData, $product, $subProducts);
+
+        if ($this->isPriceIndexingEnabled($additionalAttributes)) {
+            $customData = $this->priceManager->addPriceDataByProductType($customData, $product, $subProducts);
+        }
+
         $transport = new DataObject($customData);
         $this->eventManager->dispatch(
             'algolia_subproducts_index',
@@ -186,13 +190,16 @@ protected function addAttribute($attribute, $defaultData, $customData, $addition
      */
     public function isAttributeEnabled($additionalAttributes, $attributeName): bool
     {
-        foreach ($additionalAttributes as $attr) {
-            if ($attr['attribute'] === $attributeName) {
-                return true;
-            }
-        }
+        return $this->configHelper->isAttributeInList($additionalAttributes, $attributeName);
+    }
 
-        return false;
+    /**
+     * @param array $additionalAttributes
+     * @return bool
+     */
+    protected function isPriceIndexingEnabled(array $additionalAttributes): bool
+    {
+        return $this->configHelper->isAttributeInList($additionalAttributes, 'price');
     }
 
     /**
@@ -816,3 +823,4 @@ public function productIsInStock($product, $storeId): bool
         return $product->isSaleable() && $stockItem->getIsInStock();
     }
 }
+
diff --git a/Service/Product/ReplicaManager.php b/Service/Product/ReplicaManager.php
index 6121de3b5..e5ddb9ae1 100644
--- a/Service/Product/ReplicaManager.php
+++ b/Service/Product/ReplicaManager.php
@@ -126,7 +126,7 @@ protected function getReplicaConfigurationFromAlgolia(
 
     protected function clearAlgoliaReplicaSettingCache($primaryIndexName = null): void
     {
-        if (is_null($primaryIndexName)) {
+        if ($primaryIndexName === null) {
             $this->_algoliaReplicaConfig = [];
         } else {
             unset($this->_algoliaReplicaConfig[$primaryIndexName]);
@@ -565,7 +565,7 @@ public function getUnusedReplicaIndices(int $storeId): array
 
     protected function clearUnusedReplicaIndicesCache(?int $storeId = null): void
     {
-        if (is_null($storeId)) {
+        if ($storeId === null) {
             $this->_unusedReplicaIndices = [];
         } else {
             unset($this->_unusedReplicaIndices[$storeId]);
diff --git a/Service/Product/SortingTransformer.php b/Service/Product/SortingTransformer.php
index 746f1dba7..718f44633 100644
--- a/Service/Product/SortingTransformer.php
+++ b/Service/Product/SortingTransformer.php
@@ -51,7 +51,7 @@ public function getSortingIndices(
     ): array
     {
         // Selectively cache this result - only cache manipulation of saved settings per store
-        $useCache = is_null($currentCustomerGroupId) && is_null($attrs);
+        $useCache = $currentCustomerGroupId === null && $attrs === null;
 
         if ($clearCache) {
             unset($this->_sortingIndices[$storeId]);
@@ -78,7 +78,7 @@ public function getSortingIndices(
             if ($this->configHelper->isCustomerGroupsEnabled($storeId) && $attr[ReplicaManagerInterface::SORT_KEY_ATTRIBUTE_NAME] === ReplicaManagerInterface::SORT_ATTRIBUTE_PRICE) {
                 $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
                 $groupCollection = $this->groupCollection;
-                if (!is_null($currentCustomerGroupId)) {
+                if ($currentCustomerGroupId !== null) {
                     $groupCollection->addFilter('customer_group_id', $currentCustomerGroupId);
                 }
                 foreach ($groupCollection as $group) {
diff --git a/Setup/Patch/Data/MigrateBatchSizeConfigPatch.php b/Setup/Patch/Data/MigrateBatchSizeConfigPatch.php
new file mode 100644
index 000000000..3e28b2eaf
--- /dev/null
+++ b/Setup/Patch/Data/MigrateBatchSizeConfigPatch.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Setup\Patch\Data;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Setup\Patch\DataMigrationTrait;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+class MigrateBatchSizeConfigPatch implements DataPatchInterface
+{
+    use DataMigrationTrait;
+
+    public function __construct(
+        protected ModuleDataSetupInterface $moduleDataSetup,
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(): PatchInterface
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        $this->moveIndexingSettings();
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+
+        return $this;
+    }
+
+    /**
+     * Migrate old Indexing configurations
+     * @return void
+     */
+    protected function moveIndexingSettings(): void
+    {
+        $movedConfig = [
+            'algoliasearch_advanced/queue/number_of_element_by_page' => ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE,
+        ];
+
+        $this->migrateConfig($movedConfig);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases(): array
+    {
+        return [];
+    }
+}
diff --git a/Setup/Patch/Data/MigrateLegacyConfigPatch.php b/Setup/Patch/Data/MigrateLegacyConfigPatch.php
new file mode 100644
index 000000000..41e30d563
--- /dev/null
+++ b/Setup/Patch/Data/MigrateLegacyConfigPatch.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Setup\Patch\Data;
+
+use Algolia\AlgoliaSearch\Setup\Patch\DataMigrationTrait;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+class MigrateLegacyConfigPatch implements DataPatchInterface
+{
+    use DataMigrationTrait;
+
+    public function __construct(
+        protected ModuleDataSetupInterface $moduleDataSetup,
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(): PatchInterface
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        $this->moveIndexingSettings();
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+
+        return $this;
+    }
+
+    /**
+     * Migrate legacy configurations
+     * @return void
+     */
+    protected function moveIndexingSettings(): void
+    {
+        $movedConfig = [
+            'algoliasearch_credentials/credentials/use_adaptive_image' => 'algoliasearch_products/products/use_adaptive_image',
+            'algoliasearch_products/products/number_product_results' => 'algoliasearch_instant/instant/number_product_results',
+            'algoliasearch_products/products/show_suggestions_on_no_result_page' => 'algoliasearch_instant/instant/show_suggestions_on_no_result_page',
+            'algoliasearch_credentials/credentials/is_popup_enabled' => 'algoliasearch_autocomplete/autocomplete/is_popup_enabled',
+            'algoliasearch_credentials/credentials/is_instant_enabled' => 'algoliasearch_instant/instant/is_instant_enabled',
+       ];
+
+        $this->migrateConfig($movedConfig);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases(): array
+    {
+        return [];
+    }
+}
diff --git a/Setup/Patch/Schema/ConfigPatch.php b/Test/Integration/Config/DefaultConfigProvider.php
similarity index 71%
rename from Setup/Patch/Schema/ConfigPatch.php
rename to Test/Integration/Config/DefaultConfigProvider.php
index 564b3c6bc..6b6c1316b 100644
--- a/Setup/Patch/Schema/ConfigPatch.php
+++ b/Test/Integration/Config/DefaultConfigProvider.php
@@ -1,31 +1,9 @@
 <?php
 
-namespace Algolia\AlgoliaSearch\Setup\Patch\Schema;
+namespace Algolia\AlgoliaSearch\Test\Integration\Config;
 
-use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
-use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Framework\Mview\View\SubscriptionFactory;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\Patch\SchemaPatchInterface;
-
-class ConfigPatch implements SchemaPatchInterface
+class DefaultConfigProvider
 {
-    /**
-     * @var ConfigInterface
-     */
-    protected $config;
-
-    /**
-     * @var ProductMetadataInterface
-     */
-    protected $productMetadata;
-
-    /**
-     * @var ModuleDataSetupInterface
-     */
-    protected $moduleDataSetup;
-
     /**
      * @var string[]
      */
@@ -67,6 +45,7 @@ class ConfigPatch implements SchemaPatchInterface
         'algoliasearch_queue/queue/active' => '0',
         'algoliasearch_queue/queue/number_of_job_to_run' => '5',
         'algoliasearch_queue/queue/number_of_retries' => '3',
+        'algoliasearch_queue/queue/use_tmp_index' => '1',
 
         'algoliasearch_cc_analytics/cc_analytics_group/enable' => '0',
         'algoliasearch_cc_analytics/cc_analytics_group/is_selector' => '.ais-Hits-item a.result, .ais-InfiniteHits-item a.result',
@@ -80,7 +59,7 @@ class ConfigPatch implements SchemaPatchInterface
 
         'algoliasearch_synonyms/synonyms_group/enable_synonyms' => '0',
 
-        'algoliasearch_advanced/queue/number_of_element_by_page' => '300',
+        'algoliasearch_advanced/advanced/number_of_element_by_page' => '300',
         'algoliasearch_advanced/advanced/remove_words_if_no_result' => 'allOptional',
         'algoliasearch_advanced/advanced/partial_update' => '0',
         'algoliasearch_advanced/advanced/customer_groups_enable' => '0',
@@ -256,83 +235,16 @@ class ConfigPatch implements SchemaPatchInterface
         ],
     ];
 
-    /**
-     * @param ConfigInterface $config
-     * @param ProductMetadataInterface $productMetadata
-     * @param ModuleDataSetupInterface $moduleDataSetup Magento\Framework\App\ResourceConnection
-     */
-    public function __construct(
-        ConfigInterface $config,
-        ProductMetadataInterface $productMetadata,
-        ModuleDataSetupInterface $moduleDataSetup
-    ) {
-        $this->config = $config;
-        $this->productMetadata = $productMetadata;
-        $this->moduleDataSetup = $moduleDataSetup;
-
+    public function __construct()
+    {
         $this->serializeDefaultArrayConfigData();
         $this->mergeDefaultDataWithArrayData();
     }
 
-    /**
-     * @return array|string[]
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @return array|string[]
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-
-    /**
-     * @return ConfigPatch|void
-     */
-    public function apply()
-    {
-        $movedConfigDirectives = [
-            'algoliasearch_credentials/credentials/use_adaptive_image' => 'algoliasearch_products/products/use_adaptive_image',
-            'algoliasearch_products/products/number_product_results' => 'algoliasearch_instant/instant/number_product_results',
-            'algoliasearch_products/products/show_suggestions_on_no_result_page' => 'algoliasearch_instant/instant/show_suggestions_on_no_result_page',
-            'algoliasearch_credentials/credentials/is_popup_enabled' => 'algoliasearch_autocomplete/autocomplete/is_popup_enabled',
-            'algoliasearch_credentials/credentials/is_instant_enabled' => 'algoliasearch_instant/instant/is_instant_enabled',
-        ];
-
-        $this->moduleDataSetup->getConnection()->startSetup();
-        $connection = $this->moduleDataSetup->getConnection();
-        $table = $this->moduleDataSetup->getTable('core_config_data');
-        foreach ($movedConfigDirectives as $from => $to) {
-            try {
-                $connection->query('UPDATE ' . $table . ' SET path = "' . $to . '" WHERE path = "' . $from . '"');
-            } catch (\Magento\Framework\DB\Adapter\DuplicateException) {
-                // Skip
-            }
-        }
-
-        /* SET DEFAULT CONFIG DATA */
-        $alreadyInserted = $connection->getConnection()
-            ->query('SELECT path, value FROM ' . $table . ' WHERE path LIKE "algoliasearch_%"')
-            ->fetchAll(\PDO::FETCH_KEY_PAIR);
-
-        foreach ($this->defaultConfigData as $path => $value) {
-            if (isset($alreadyInserted[$path])) {
-                continue;
-            }
-            $this->config->saveConfig($path, $value, 'default', 0);
-        }
-
-        $this->moduleDataSetup->getConnection()->endSetup();
-    }
-
     /**
      * @return string[]
      */
-    public function getDefaultConfigData()
+    public function getDefaultConfigData(): array
     {
         return $this->defaultConfigData;
     }
@@ -340,24 +252,17 @@ public function getDefaultConfigData()
     /**
      * @return void
      */
-    protected function serializeDefaultArrayConfigData()
+    protected function serializeDefaultArrayConfigData(): void
     {
-        $serializeMethod = 'serialize';
-
-        $magentoVersion = $this->productMetadata->getVersion();
-        if (version_compare($magentoVersion, '2.2.0-dev', '>=') === true) {
-            $serializeMethod = 'json_encode';
-        }
-
         foreach ($this->defaultArrayConfigData as $path => $array) {
-            $this->defaultArrayConfigData[$path] = $serializeMethod($array);
+            $this->defaultArrayConfigData[$path] = json_encode($array);
         }
     }
 
     /**
      * @return void
      */
-    protected function mergeDefaultDataWithArrayData()
+    protected function mergeDefaultDataWithArrayData(): void
     {
         $this->defaultConfigData = array_merge($this->defaultConfigData, $this->defaultArrayConfigData);
     }
diff --git a/Test/Integration/Indexing/Config/ConfigTest.php b/Test/Integration/Indexing/Config/ConfigTest.php
index 2f6af8375..3cc32e90e 100644
--- a/Test/Integration/Indexing/Config/ConfigTest.php
+++ b/Test/Integration/Indexing/Config/ConfigTest.php
@@ -32,7 +32,13 @@ public function testRenderingContent()
     {
         $this->setConfig('algoliasearch_instant/instant_facets/enable_dynamic_facets', '1');
 
-        $this->syncSettingsToAlgolia();
+        try {
+            $this->syncSettingsToAlgolia();
+        } catch (AlgoliaException $e) {
+            // Skip this test if the renderingContent feature isn't enabled on the application
+            $this->setConfig('algoliasearch_instant/instant_facets/enable_dynamic_facets', '0');
+            $this->markTestSkipped($e->getMessage());
+        }
 
         $indexOptions = $this->indexOptionsBuilder->buildWithEnforcedIndex($this->indexPrefix . 'default_products');
         $indexSettings = $this->algoliaConnector->getSettings($indexOptions);
diff --git a/Test/Integration/Indexing/Product/MultiStoreReplicaTest.php b/Test/Integration/Indexing/Product/MultiStoreReplicaTest.php
index e04a75e51..32e766249 100644
--- a/Test/Integration/Indexing/Product/MultiStoreReplicaTest.php
+++ b/Test/Integration/Indexing/Product/MultiStoreReplicaTest.php
@@ -3,8 +3,8 @@
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Product;
 
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
-use Algolia\AlgoliaSearch\Console\Command\ReplicaRebuildCommand;
-use Algolia\AlgoliaSearch\Console\Command\ReplicaSyncCommand;
+use Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaRebuildCommand;
+use Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaSyncCommand;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder as ProductIndexOptionsBuilder;
 use Algolia\AlgoliaSearch\Service\Product\SortingTransformer;
diff --git a/Test/Integration/Indexing/Product/ProductsIndexingTest.php b/Test/Integration/Indexing/Product/ProductsIndexingTest.php
index 2fe18435a..577d2daa0 100644
--- a/Test/Integration/Indexing/Product/ProductsIndexingTest.php
+++ b/Test/Integration/Indexing/Product/ProductsIndexingTest.php
@@ -70,7 +70,7 @@ public function testDefaultIndexableAttributes()
             'thumbnail_url',
             'image_url',
             'in_stock',
-            'price',
+            //'price', since version 3.17.0, the price attribute is not mandatory if it's not present in any attributes list
             'type_id',
             'algoliaLastUpdateAtCET',
             'categoryIds',
@@ -85,6 +85,8 @@ public function testDefaultIndexableAttributes()
             unset($hit[$attribute]);
         }
 
+        $this->assertArrayNotHasKey('price', $hit, 'Record has a price attribute but it should not');
+
         $extraAttributes = implode(', ', array_keys($hit));
         $this->assertEmpty($hit, 'Extra products attributes (' . $extraAttributes . ') are indexed and should not be.');
     }
diff --git a/Test/Integration/Indexing/Product/ReplicaIndexingTest.php b/Test/Integration/Indexing/Product/ReplicaIndexingTest.php
index af071f6bd..8094bb135 100644
--- a/Test/Integration/Indexing/Product/ReplicaIndexingTest.php
+++ b/Test/Integration/Indexing/Product/ReplicaIndexingTest.php
@@ -2,7 +2,6 @@
 
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Product;
 
-use Algolia\AlgoliaSearch\Algolia;
 use Algolia\AlgoliaSearch\Api\LoggerInterface;
 use Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface;
 use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
@@ -11,15 +10,14 @@
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
 use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
 use Algolia\AlgoliaSearch\Model\IndicesConfigurator;
-use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
-use Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder;
-use Algolia\AlgoliaSearch\Test\Integration\Indexing\Product\Traits\ReplicaAssertionsTrait;
 use Algolia\AlgoliaSearch\Registry\ReplicaState;
-use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
+use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
 use Algolia\AlgoliaSearch\Service\IndexNameFetcher;
+use Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder;
 use Algolia\AlgoliaSearch\Service\Product\ReplicaManager;
 use Algolia\AlgoliaSearch\Service\Product\SortingTransformer;
 use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
+use Algolia\AlgoliaSearch\Test\Integration\Indexing\Product\Traits\ReplicaAssertionsTrait;
 use Algolia\AlgoliaSearch\Test\Integration\TestCase;
 use Algolia\AlgoliaSearch\Validator\VirtualReplicaValidatorFactory;
 use Magento\Framework\App\State as AppState;
@@ -157,7 +155,7 @@ public function testReplicaRebuild(): void
 
         $sorting = $this->populateReplicas(1);
 
-        $rebuildCmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\ReplicaRebuildCommand::class);
+        $rebuildCmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaRebuildCommand::class);
         $this->invokeMethod(
             $rebuildCmd,
             'execute',
@@ -410,7 +408,7 @@ protected function populateReplicas(int $storeId): array
     {
         $sorting = $this->objectManager->get(\Algolia\AlgoliaSearch\Service\Product\SortingTransformer::class)->getSortingIndices($storeId, null, null, true);
 
-        $cmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\ReplicaSyncCommand::class);
+        $cmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaSyncCommand::class);
 
         $this->mockProperty($cmd, 'output', \Symfony\Component\Console\Output\OutputInterface::class);
 
diff --git a/Test/Integration/Indexing/Product/Traits/ReplicaAssertionsTrait.php b/Test/Integration/Indexing/Product/Traits/ReplicaAssertionsTrait.php
index 3d4dcd1fe..85f5d6faa 100644
--- a/Test/Integration/Indexing/Product/Traits/ReplicaAssertionsTrait.php
+++ b/Test/Integration/Indexing/Product/Traits/ReplicaAssertionsTrait.php
@@ -130,7 +130,7 @@ protected function assertNoSortingAttribute($sortAttr, $sortDir): void
      */
     protected function mockSortUpdate(string $sortAttr, string $sortDir, array $attr, ?StoreInterface $store = null): void
     {
-        $sorting = $this->configHelper->getSorting(!is_null($store) ? $store->getId() : null);
+        $sorting = $this->configHelper->getSorting($store?->getId());
         $existing = array_filter($sorting, fn($item) => $item['attribute'] === $sortAttr && $item['sort'] === $sortDir);
 
         if ($existing) {
@@ -150,7 +150,7 @@ protected function mockSortUpdate(string $sortAttr, string $sortDir, array $attr
         $this->setConfig(
             ConfigHelper::SORTING_INDICES,
             json_encode($sorting),
-            !is_null($store) ? $store->getCode() : 'default'
+            $store?->getCode() ?? 'default'
         );
     }
 }
diff --git a/Test/Integration/Indexing/Queue/QueueTest.php b/Test/Integration/Indexing/Queue/QueueTest.php
index 85b8a22f5..9eb931127 100644
--- a/Test/Integration/Indexing/Queue/QueueTest.php
+++ b/Test/Integration/Indexing/Queue/QueueTest.php
@@ -3,6 +3,7 @@
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Queue;
 
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper;
 use Algolia\AlgoliaSearch\Model\Indexer\QueueRunner;
 use Algolia\AlgoliaSearch\Model\IndicesConfigurator;
 use Algolia\AlgoliaSearch\Model\Job;
@@ -44,11 +45,11 @@ protected function setUp(): void
     public function testFill()
     {
         $this->resetConfigs([
-            ConfigHelper::NUMBER_OF_JOB_TO_RUN,
+            QueueHelper::NUMBER_OF_JOB_TO_RUN,
             ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE,
         ]);
 
-        $this->setConfig(ConfigHelper::IS_ACTIVE, '1');
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
         $this->connection->query('TRUNCATE TABLE algoliasearch_queue');
 
         $productBatchQueueProcessor = $this->objectManager->get(ProductBatchQueueProcessor::class);
@@ -84,7 +85,7 @@ public function testFill()
 
     public function testExecute()
     {
-        $this->setConfig(ConfigHelper::IS_ACTIVE, '1');
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
         $this->connection->query('TRUNCATE TABLE algoliasearch_queue');
 
         $productBatchQueueProcessor = $this->objectManager->get(ProductBatchQueueProcessor::class);
@@ -136,16 +137,58 @@ public function testExecute()
         $this->assertEquals(0, count($rows));
     }
 
+    public function testTmpIndexConfig()
+    {
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
+        // Setting "Use a temporary index for full products reindex" configuration to "No"
+        $this->setConfig(QueueHelper::USE_TMP_INDEX, '0');
+        $this->connection->query('TRUNCATE TABLE algoliasearch_queue');
+
+        $productBatchQueueProcessor = $this->objectManager->get(ProductBatchQueueProcessor::class);
+        $productBatchQueueProcessor->processBatch(1);
+
+        $rows = $this->connection->query('SELECT * FROM algoliasearch_queue')->fetchAll();
+        // Without temporary index enabled, there are only 2 jobs (saveConfigurationToAlgolia and buildIndexFull)
+        $this->assertEquals(2, count($rows));
+
+        $indexingJob = $rows[1];
+        $jobData = json_decode($indexingJob['data'], true);
+
+        $this->assertEquals('buildIndexFull', $indexingJob['method']);
+        $this->assertFalse($jobData['options']['useTmpIndex']);
+
+        /** @var Queue $queue */
+        $queue = $this->objectManager->get(Queue::class);
+
+        // Run the first job (saveSettings)
+        $queue->runCron(1, true);
+
+        $this->algoliaConnector->waitLastTask();
+
+        $indices = $this->algoliaConnector->listIndexes();
+
+        $existsDefaultTmpIndex = false;
+        foreach ($indices['items'] as $index) {
+            if ($index['name'] === $this->indexPrefix . 'default_products_tmp') {
+                $existsDefaultTmpIndex = true;
+            }
+        }
+        // Checking if the temporary index hasn't been created
+        $this->assertFalse($existsDefaultTmpIndex, 'Temporary index exists and it should not');
+    }
+
     public function testSettings()
     {
         $this->resetConfigs([
-            ConfigHelper::NUMBER_OF_JOB_TO_RUN,
+            QueueHelper::NUMBER_OF_JOB_TO_RUN,
             ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE,
             ConfigHelper::FACETS,
+            QueueHelper::USE_TMP_INDEX,
             ConfigHelper::PRODUCT_ATTRIBUTES
         ]);
 
-        $this->setConfig(ConfigHelper::IS_ACTIVE, '1');
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
+        $this->setConfig(ConfigHelper::ENABLE_INDEXER_QUEUE, '1');
 
         $this->connection->query('DELETE FROM algoliasearch_queue');
 
@@ -178,8 +221,9 @@ public function testSettings()
 
     public function testMergeSettings()
     {
-        $this->setConfig(ConfigHelper::IS_ACTIVE, '1');
-        $this->setConfig(ConfigHelper::NUMBER_OF_JOB_TO_RUN, 1);
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
+        $this->setConfig(ConfigHelper::ENABLE_INDEXER_QUEUE, '1');
+        $this->setConfig(QueueHelper::NUMBER_OF_JOB_TO_RUN, 1);
         $this->setConfig(ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE, 300);
 
         $this->connection->query('DELETE FROM algoliasearch_queue');
@@ -791,7 +835,7 @@ public function testGetJobs()
     public function testHugeJob()
     {
         // Default value - maxBatchSize = 1000
-        $this->setConfig(ConfigHelper::NUMBER_OF_JOB_TO_RUN, 10);
+        $this->setConfig(QueueHelper::NUMBER_OF_JOB_TO_RUN, 10);
         $this->setConfig(ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE, 100);
 
         $productIds = range(1, 5000);
@@ -829,7 +873,7 @@ public function testHugeJob()
     public function testMaxSingleJobSize()
     {
         // Default value - maxBatchSize = 1000
-        $this->setConfig(ConfigHelper::NUMBER_OF_JOB_TO_RUN, 10);
+        $this->setConfig(QueueHelper::NUMBER_OF_JOB_TO_RUN, 10);
         $this->setConfig(ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE, 100);
 
         $productIds = range(1, 99);
@@ -870,13 +914,13 @@ public function testMaxSingleJobSize()
     public function testMaxSingleJobsSizeOnProductReindex()
     {
         $this->resetConfigs([
-            ConfigHelper::NUMBER_OF_JOB_TO_RUN,
+            QueueHelper::NUMBER_OF_JOB_TO_RUN,
             ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE,
         ]);
 
-        $this->setConfig(ConfigHelper::IS_ACTIVE, '1');
+        $this->setConfig(QueueHelper::IS_ACTIVE, '1');
 
-        $this->setConfig(ConfigHelper::NUMBER_OF_JOB_TO_RUN, 10);
+        $this->setConfig(QueueHelper::NUMBER_OF_JOB_TO_RUN, 10);
         $this->setConfig(ConfigHelper::NUMBER_OF_ELEMENT_BY_PAGE, 100);
 
         $this->connection->query('TRUNCATE TABLE algoliasearch_queue');
diff --git a/Test/Integration/TestCase.php b/Test/Integration/TestCase.php
index 7129d1981..8d1378067 100644
--- a/Test/Integration/TestCase.php
+++ b/Test/Integration/TestCase.php
@@ -8,18 +8,18 @@
 use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
 use Algolia\AlgoliaSearch\Service\IndexNameFetcher;
 use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
-use Algolia\AlgoliaSearch\Setup\Patch\Schema\ConfigPatch;
 use Algolia\AlgoliaSearch\Test\Integration\AssertValues\Magento246CE;
 use Algolia\AlgoliaSearch\Test\Integration\AssertValues\Magento246EE;
 use Algolia\AlgoliaSearch\Test\Integration\AssertValues\Magento247CE;
 use Algolia\AlgoliaSearch\Test\Integration\AssertValues\Magento247EE;
+use Algolia\AlgoliaSearch\Test\Integration\Config\DefaultConfigProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
-abstract class TestCase extends \PHPUnit\Framework\TestCase
+abstract class TestCase extends \Algolia\AlgoliaSearch\Test\TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -70,9 +70,9 @@ protected function getIndexName(string $storeIndexPart): string
 
     protected function resetConfigs($configs = [])
     {
-        /** @var ConfigPatch $installClass */
-        $installClass = $this->getObjectManager()->get(ConfigPatch::class);
-        $defaultConfigData = $installClass->getDefaultConfigData();
+        /** @var DefaultConfigProvider $defaultConfigProvider */
+        $defaultConfigProvider = $this->getObjectManager()->get(DefaultConfigProvider::class);
+        $defaultConfigData = $defaultConfigProvider->getDefaultConfigData();
 
         foreach ($configs as $config) {
             $value = (string) $defaultConfigData[$config];
@@ -230,35 +230,6 @@ private function bootstrap()
         $this->boostrapped = true;
     }
 
-
-    /**
-     * @throws \ReflectionException
-     */
-    protected function mockProperty(object $object, string $propertyName, string $propertyClass): void
-    {
-        $mock = $this->createMock($propertyClass);
-        $reflection = new \ReflectionClass($object);
-        $property = $reflection->getProperty($propertyName);
-        $property->setValue($object, $mock);
-    }
-
-    /**
-     * Call protected/private method of a class.
-     *
-     * @param object $object instantiated object that we will run method on
-     * @param string $methodName Method name to call
-     * @param array $parameters array of parameters to pass into method
-     *
-     * @throws \ReflectionException
-     *
-     * @return mixed method return
-     */
-    protected function invokeMethod(object $object, string $methodName, array $parameters = [])
-    {
-        $reflection = new \ReflectionClass($object::class);
-        return $reflection->getMethod($methodName)->invokeArgs($object, $parameters);
-    }
-
     private function getMagentoVersion()
     {
         return $this->productMetadata->getVersion();
diff --git a/Test/TestCase.php b/Test/TestCase.php
new file mode 100644
index 000000000..9a490b135
--- /dev/null
+++ b/Test/TestCase.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Test;
+
+/**
+ * Base test case for all tests in the project
+ * Includes helper methods for invoking protected/private methods and properties
+ */
+abstract class TestCase extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Call protected/private method of a class.
+     *
+     * @param object $object instantiated object that we will run method on
+     * @param string $methodName Method name to call
+     * @param array $parameters array of parameters to pass into method
+     *
+     * @throws \ReflectionException
+     *
+     * @return mixed method return
+     */
+    protected function invokeMethod(object $object, string $methodName, array $parameters = []): mixed
+    {
+        $reflection = new \ReflectionClass($object::class);
+        return $reflection->getMethod($methodName)->invokeArgs($object, $parameters);
+    }
+
+    /**
+     * Set a private property of a class
+     *
+     * @param object $obj The object to set the property for
+     * @param string $prop The name of the property to set
+     * @param mixed $value The value to set the property to
+     *
+     * @throws \ReflectionException
+     */
+    protected function setPrivateProperty(object $obj, string $prop, mixed $value): void
+    {
+        $ref = new \ReflectionClass($obj);
+        $p = $ref->getProperty($prop);
+        $p->setValue($obj, $value);
+    }
+
+    /**
+     * Mock a private property of a class
+     *
+     * @param object $object The object to mock the property for
+     * @param string $propertyName The name of the property to mock
+     * @param string $propertyClass The class of the property to mock
+     *
+     * @throws \ReflectionException
+     */
+    protected function mockProperty(object $object, string $propertyName, string $propertyClass): void
+    {
+        $mock = $this->createMock($propertyClass);
+        $reflection = new \ReflectionClass($object);
+        $property = $reflection->getProperty($propertyName);
+        $property->setValue($object, $mock);
+    }
+}
diff --git a/Test/Unit/Block/ConfigurationTest.php b/Test/Unit/Block/ConfigurationTest.php
new file mode 100644
index 000000000..7d6a057e5
--- /dev/null
+++ b/Test/Unit/Block/ConfigurationTest.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Test\Unit\Block;
+
+use Algolia\AlgoliaSearch\Block\Configuration as ConfigurationBlock;
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\AutocompleteHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\InstantSearchHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\PersonalizationHelper;
+use Algolia\AlgoliaSearch\Helper\Data as CoreHelper;
+use Algolia\AlgoliaSearch\Helper\Entity\CategoryHelper;
+use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Helper\Entity\SuggestionHelper;
+use Algolia\AlgoliaSearch\Helper\LandingPageHelper;
+use Algolia\AlgoliaSearch\Registry\CurrentCategory;
+use Algolia\AlgoliaSearch\Registry\CurrentProduct;
+use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
+use Algolia\AlgoliaSearch\Service\Product\SortingTransformer;
+use Magento\Catalog\Model\Category;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Locale\Currency;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Search\Helper\Data as CatalogSearchHelper;
+use PHPUnit\Framework\TestCase;
+
+class ConfigurationTest extends TestCase
+{
+    protected ?ConfigurationBlock $configurationBlock;
+
+    protected ?ConfigHelper $config;
+    protected ?AutocompleteHelper $autocompleteConfig;
+    protected ?InstantSearchHelper $instantSearchConfig;
+    protected ?PersonalizationHelper $personalizationHelper;
+    protected ?CatalogSearchHelper $catalogSearchHelper;
+    protected ?ProductHelper $productHelper;
+    protected ?Currency $currency;
+    protected ?Format $format;
+    protected ?CurrentProduct $currentProduct;
+    protected ?AlgoliaConnector $algoliaConnector;
+    protected ?UrlHelper $urlHelper;
+    protected ?FormKey $formKey;
+    protected ?HttpContext $httpContext;
+    protected ?CoreHelper $coreHelper;
+    protected ?CategoryHelper $categoryHelper;
+    protected ?SuggestionHelper $suggestionHelper;
+    protected ?LandingPageHelper $landingPageHelper;
+    protected ?CheckoutSession $checkoutSession;
+    protected ?DateTime $date;
+    protected ?CurrentCategory $currentCategory;
+    protected ?SortingTransformer $sortingTransformer;
+    protected ?Context $context;
+
+    protected ?Http $request;
+
+    protected function setUp(): void
+    {
+        $this->config = $this->createMock(ConfigHelper::class);
+        $this->autocompleteConfig = $this->createMock(AutocompleteHelper::class);
+        $this->instantSearchConfig = $this->createMock(InstantSearchHelper::class);
+        $this->personalizationHelper = $this->createMock(PersonalizationHelper::class);
+        $this->catalogSearchHelper = $this->createMock(CatalogSearchHelper::class);
+        $this->productHelper = $this->createMock(ProductHelper::class);
+        $this->currency = $this->createMock(Currency::class);
+        $this->format = $this->createMock(Format::class);
+        $this->currentProduct = $this->createMock(CurrentProduct::class);
+        $this->algoliaConnector = $this->createMock(AlgoliaConnector::class);
+        $this->urlHelper = $this->createMock(UrlHelper::class);
+        $this->formKey = $this->createMock(FormKey::class);
+        $this->httpContext = $this->createMock(HttpContext::class);
+        $this->coreHelper = $this->createMock(CoreHelper::class);
+        $this->categoryHelper = $this->createMock(CategoryHelper::class);
+        $this->suggestionHelper = $this->createMock(SuggestionHelper::class);
+        $this->landingPageHelper = $this->createMock(LandingPageHelper::class);
+        $this->checkoutSession = $this->createMock(CheckoutSession::class);
+        $this->date = $this->createMock(DateTime::class);
+        $this->currentCategory = $this->createMock(CurrentCategory::class);
+        $this->sortingTransformer = $this->createMock(SortingTransformer::class);
+        $this->context = $this->createMock(Context::class);
+
+        $this->request = $this->createMock(Http::class);
+        $this->context->method('getRequest')->willReturn($this->request);
+
+        $this->configurationBlock = new ConfigurationBlock(
+            $this->config,
+            $this->autocompleteConfig ,
+            $this->instantSearchConfig ,
+            $this->personalizationHelper ,
+            $this->catalogSearchHelper ,
+            $this->productHelper,
+            $this->currency ,
+            $this->format ,
+            $this->currentProduct ,
+            $this->algoliaConnector ,
+            $this->urlHelper ,
+            $this->formKey ,
+            $this->httpContext ,
+            $this->coreHelper ,
+            $this->categoryHelper,
+            $this->suggestionHelper ,
+            $this->landingPageHelper ,
+            $this->checkoutSession,
+            $this->date ,
+            $this->currentCategory ,
+            $this->sortingTransformer ,
+            $this->context,
+        );
+    }
+
+    /**
+     * @dataProvider searchPageDataProvider
+     */
+    public function testIsSearchPage($action, $categoryId, $categoryDisplayMode, $expectedResult): void
+    {
+        $this->config->method('isInstantEnabled')->willReturn(true);
+        $this->request->method('getFullActionName')->willReturn($action);
+
+        $controller = explode('_', $action);
+        $controller = $controller[1];
+
+        $this->request->method('getControllerName')->willReturn($controller);
+        $this->config->method('replaceCategories')->willReturn(true);
+
+        $category = $this->createMock(Category::class);
+        $category->method('getId')->willReturn($categoryId);
+        $category->method('getDisplayMode')->willReturn($categoryDisplayMode);
+        $this->currentCategory->method('get')->willReturn($category);
+
+        $this->assertEquals($expectedResult, $this->configurationBlock->isSearchPage());
+    }
+
+    public static function searchPageDataProvider(): array
+    {
+        return [
+            [ // true if category has an ID
+                'action' => 'catalog_category_view',
+                'categoryId' => 1,
+                'categoryDisplayMode' => 'PRODUCT',
+                'expectedResult' => true
+            ],
+            [ // false if category has no ID
+                'action' => 'catalog_category_view',
+                'categoryId' => null,
+                'categoryDisplayMode' => 'PRODUCT',
+                'expectedResult' => false
+            ],
+            [ // false if category has a PAGE as display mode
+                'action' => 'catalog_category_view',
+                'categoryId' => 1,
+                'categoryDisplayMode' => 'PAGE',
+                'expectedResult' => false
+            ],
+            [ // true if catalogsearch
+                'action' => 'catalogsearch_result_index',
+                'categoryId' => null,
+                'categoryDisplayMode' => 'FOO',
+                'expectedResult' => true
+            ],
+            [ // true if landing page
+                'action' => 'algolia_landingpage_view',
+                'categoryId' => null,
+                'categoryDisplayMode' => 'FOO',
+                'expectedResult' => true
+            ]
+        ];
+    }
+}
diff --git a/Test/Unit/Console/Command/Queue/ClearQueueCommandTest.php b/Test/Unit/Console/Command/Queue/ClearQueueCommandTest.php
new file mode 100644
index 000000000..56e589a03
--- /dev/null
+++ b/Test/Unit/Console/Command/Queue/ClearQueueCommandTest.php
@@ -0,0 +1,406 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Test\Unit\Console\Command\Queue;
+
+use Algolia\AlgoliaSearch\Console\Command\Queue\ClearQueueCommand;
+use Algolia\AlgoliaSearch\Model\ResourceModel\Job as JobResourceModel;
+use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
+use Algolia\AlgoliaSearch\Test\TestCase;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class ClearQueueCommandTest extends TestCase
+{
+    private null|(State&MockObject) $state = null;
+    private null|(StoreNameFetcher&MockObject) $storeNameFetcher = null;
+    private null|(StoreManagerInterface&MockObject) $storeManager = null;
+    private null|(JobResourceModel&MockObject) $jobResourceModel = null;
+
+    protected function setUp(): void
+    {
+        /* Load mock constructor arguments for the Command partial */
+        $this->state            = $this->createMock(State::class);
+        $this->storeNameFetcher = $this->createMock(StoreNameFetcher::class);
+        $this->storeManager     = $this->createMock(StoreManagerInterface::class);
+        $this->jobResourceModel = $this->createMock(JobResourceModel::class);
+    }
+
+    /**
+     * Test that the command returns success when the user cancels the operation
+     * @throws \ReflectionException
+     */
+    public function testExecuteReturnsSuccessWhenUserCancels(): void
+    {
+        $cmd = $this->makePartial(['setAreaCode', 'confirmOperation', 'getStoreIds', 'decorateOperationAnnouncementMessage', 'clearQueue']);
+
+        $cmd->expects($this->once())->method('setAreaCode');
+        $cmd->expects($this->once())->method('confirmOperation')->willReturn(false);
+        $cmd->expects($this->never())->method('getStoreIds');
+        $cmd->expects($this->never())->method('clearQueue');
+
+        $input  = new ArrayInput([]);
+        $output = $this->bufOut();
+
+        $code = $this->invokeExecute($cmd, $input, $output);
+        $this->assertSame(Cli::RETURN_SUCCESS, $code);
+    }
+
+    /**
+     * Test that the command clears the indexing queue for the provided store IDs
+     * @throws \ReflectionException
+     */
+    public function testExecuteClearsProvidedStoreIds(): void
+    {
+        $cmd = $this->makePartial(['setAreaCode', 'confirmOperation', 'getStoreIds', 'decorateOperationAnnouncementMessage', 'clearQueue']);
+
+        $cmd->method('setAreaCode');
+        $cmd->method('confirmOperation')->willReturn(true);
+        $cmd->method('getStoreIds')->willReturn([1, 2]);
+
+        $msg = 'Clearing indexing queue for stores 1, 2';
+        $cmd->method('decorateOperationAnnouncementMessage')->willReturn($msg);
+
+        $cmd->expects($this->once())
+            ->method('clearQueue')
+            ->with([1,2]);
+
+        $input  = new ArrayInput([]);
+        $output = $this->bufOut();
+
+        $code = $this->invokeExecute($cmd, $input, $output);
+        $this->assertSame(Cli::RETURN_SUCCESS, $code);
+
+        $this->assertStringContainsString($msg, $output->fetch());
+    }
+
+    /**
+     * Test that the command returns failure when the clear operation fails
+     *
+     * @throws \ReflectionException
+     */
+    public function testExecuteReturnsFailureOnClearException(): void
+    {
+        $cmd = $this->makePartial(['setAreaCode', 'confirmOperation', 'getStoreIds', 'decorateOperationAnnouncementMessage', 'clearQueue']);
+
+        $cmd->method('setAreaCode');
+        $cmd->method('confirmOperation')->willReturn(true);
+        $cmd->method('getStoreIds')->willReturn([]);
+        $cmd->method('decorateOperationAnnouncementMessage')->willReturn('Clearing indexing queue for all stores');
+
+        $errMsg = "Error encountered while attempting to clear queue.";
+        $cmd->method('clearQueue')->willThrowException(new \Exception($errMsg));
+
+        $input  = new ArrayInput([]);
+        $output = $this->bufOut();
+
+        $code = $this->invokeExecute($cmd, $input, $output);
+        $this->assertSame(Cli::RETURN_FAILURE, $code);
+        $this->assertStringContainsString($errMsg, $output->fetch());
+    }
+
+    /**
+     * Test that the command calls the clearQueueForStore method for each store ID
+     *
+     * @throws \ReflectionException
+     */
+    public function testClearQueueCallsPerStore(): void
+    {
+        $cmd = $this->makePartial(['clearQueueForStore', 'clearQueueForAllStores']);
+
+        $expectedStoreIds = [1, 2];
+        $callIndex = 0;
+        $cmd->expects($this->exactly(2))
+            ->method('clearQueueForStore')
+            ->willReturnCallback(function($storeId) use (&$callIndex, $expectedStoreIds) {
+                $this->assertSame(
+                    $expectedStoreIds[$callIndex],
+                    $storeId,
+                    "clearQueueForStore called with unexpected storeId at call $callIndex"
+                );
+                $callIndex++;
+            });
+
+        $cmd->expects($this->never())->method('clearQueueForAllStores');
+
+        $this->invokeMethod($cmd, 'clearQueue', [[1, 2]]);
+    }
+
+    /**
+     * Test that the command calls the clearQueueForAllStores method when no store IDs are provided
+     *
+     * @throws \ReflectionException
+     */
+    public function testClearQueueEmptyCallsAllStores(): void
+    {
+        $cmd = $this->makePartial(['clearQueueForStore', 'clearQueueForAllStores']);
+
+        $cmd->expects($this->never())->method('clearQueueForStore');
+        $cmd->expects($this->once())->method('clearQueueForAllStores');
+
+        $this->invokeMethod($cmd, 'clearQueue');
+    }
+
+    /**
+     * Test that the command truncates the main table when no store IDs are provided
+     *
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForAllStoresTruncatesMainTable(): void
+    {
+        $adapter = $this->createMock(AdapterInterface::class);
+
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+        $this->jobResourceModel->method('getMainTable')->willReturn('algoliasearch_queue');
+
+        $adapter->expects($this->once())->method('truncateTable')->with('algoliasearch_queue');
+
+        $cmd = $this->makePartial();
+        $this->invokeMethod($cmd, 'clearQueue');
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreSuccess(): void
+    {
+        $cmd = $this->makePartial(['clearQueueTableForStore']);
+        $output = $this->bufOut();
+
+        // Inject output (protected on the parent); easiest is via reflection:
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $this->storeNameFetcher->method('getStoreName')->with(1)->willReturn('Default Store');
+        $cmd->expects($this->once())->method('clearQueueTableForStore')->with(1);
+
+        $this->invokeMethod($cmd, 'clearQueueForStore', [1]);
+
+        $text = $output->fetch();
+        $this->assertStringContainsString('Clearing indexing queue for Default Store', $text);
+        $this->assertStringContainsString('Indexing queue cleared for Default Store', $text);
+    }
+
+    /**
+     * @throws \ReflectionException
+     * @throws NoSuchEntityException
+     */
+    public function testClearQueueForStoreErrorPrinted(): void
+    {
+        $cmd = $this->makePartial(['clearQueueTableForStore']);
+        $output = $this->bufOut();
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $this->storeNameFetcher->method('getStoreName')->with(1)->willReturn('Default Store');
+        $errorMsg = 'DB operation failed';
+        $cmd->method('clearQueueTableForStore')->willThrowException(new \Exception($errorMsg));
+
+        $this->invokeMethod($cmd, 'clearQueueForStore', [1]);
+
+        $this->assertStringContainsString("Failed to clear indexing queue for Default Store: $errorMsg", $output->fetch());
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreJsonPathDeletesJobs(): void
+    {
+        $adapter = $this->getMockSearchAdapter();
+        $output  = $this->bufOut();
+
+        $cmd = $this->makePartial();
+
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+        $this->jobResourceModel->method('getMainTable')->willReturn('algoliasearch_queue');
+
+        $adapter->expects($this->once())
+            ->method('fetchCol')
+            ->willReturn([10, 11]);
+
+        $adapter->expects($this->once())
+            ->method('delete')
+            ->with('algoliasearch_queue', ['job_id IN (?)' => [10,11]])
+            ->willReturn(2);
+
+        $this->invokeMethod($cmd, 'clearQueueForStore', [5]);
+
+        $this->assertStringContainsString('Deleted 2 jobs for store ID 5', $output->fetch());
+    }
+
+    /**
+     * @throws NoSuchEntityException
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreJsonPathNoJobs(): void
+    {
+        $adapter = $this->getMockSearchAdapter();
+        $output  = $this->bufOut();
+
+        $cmd = $this->makePartial();
+
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+        $this->jobResourceModel->method('getMainTable')->willReturn('algoliasearch_queue');
+
+        $adapter->method('fetchCol')->willReturn([]);
+
+        $this->invokeMethod($cmd, 'clearQueueForStore', [5]);
+
+        $this->assertStringContainsString('No jobs found for store ID 5', $output->fetch());
+    }
+
+    /**
+     * @throws NoSuchEntityException
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreFallsBackWhenJsonThrows(): void
+    {
+        $cmd = $this->makePartial(['clearQueueTableForStoreFallback']);
+        $output = $this->bufOut();
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $adapter = $this->getMockSearchAdapter();
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+
+        $adapter->method('select')->willThrowException(new \Exception('No JSON support'));
+
+        $cmd->expects($this->once())->method('clearQueueTableForStoreFallback')->with(5);
+
+        $this->invokeMethod($cmd, 'clearQueueForStore', [5]);
+
+        $this->assertStringContainsString('JSON filtering not supported', $output->fetch());
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreFallbackDeletesMatching(): void
+    {
+        $cmd = $this->makePartial();
+        $output = $this->bufOut();
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $adapter = $this->getMockSearchAdapter();
+
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+        $this->jobResourceModel->method('getMainTable')->willReturn('algoliasearch_queue');
+
+        $adapter->method('fetchAll')->willReturn([
+            ['job_id' => 1, 'data' => '{"storeId":5,"foo":1}'],
+            ['job_id' => 2, 'data' => '{"storeId":7}'],
+            ['job_id' => 3, 'data' => '{"storeId":5}'],
+        ]);
+
+        $adapter->expects($this->once())
+            ->method('delete')
+            ->with('algoliasearch_queue', ['job_id IN (?)' => [1,3]])
+            ->willReturn(2);
+
+        $this->invokeMethod($cmd, 'clearQueueTableForStoreFallback', [5]);
+
+        $this->assertStringContainsString('Deleted 2 jobs for store ID 5 (fallback method)', $output->fetch());
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    public function testClearQueueForStoreFallbackNoMatch(): void
+    {
+        $cmd = $this->makePartial();
+        $output = $this->bufOut();
+        $this->setPrivateProperty($cmd, 'output', $output);
+
+        $adapter = $this->getMockSearchAdapter();
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+
+        $adapter->method('fetchAll')->willReturn([
+            ['job_id' => 1, 'data' => '{"storeId":8}'],
+        ]);
+
+        $this->invokeMethod($cmd, 'clearQueueTableForStoreFallback', [5]);
+
+        $this->assertStringContainsString('No jobs found for store ID 5 (fallback method)', $output->fetch());
+    }
+
+    public function testClearQueueForStoreFallbackThrowsWrapped(): void
+    {
+        $cmd = $this->makePartial();
+        $adapter = $this->getMockSearchAdapter();
+        $this->jobResourceModel->method('getConnection')->willReturn($adapter);
+
+        $adapter->method('fetchAll')->willThrowException(new \Exception('db fail'));
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Failed to clear queue for store 5: db fail');
+
+        $this->invokeMethod($cmd, 'clearQueueTableForStoreFallback', [5]);
+    }
+
+    public function testMetadataStrings(): void
+    {
+        $cmd = $this->makePartial();
+        $this->assertSame('clear', $this->invokeMethod($cmd, 'getCommandName'));
+        $this->assertStringContainsString('queue:', $this->invokeMethod($cmd, 'getCommandPrefix'));
+        $this->assertStringContainsString('Clear the indexing queue', $this->invokeMethod($cmd, 'getCommandDescription'));
+        $this->assertStringContainsString('algolia:queue:clear', $this->invokeMethod($cmd, 'getStoreArgumentDescription'));
+    }
+
+    /**
+     * Create a partial mock of the ClearQueueCommand
+     *
+     * @param array $methodsToMock List of methods to mock
+     * @return ClearQueueCommand&MockObject
+     */
+    private function makePartial(array $methodsToMock = []): ClearQueueCommand&MockObject
+    {
+        /** @var ClearQueueCommand&MockObject $cmd */
+        $cmd = $this->getMockBuilder(ClearQueueCommand::class)
+            ->setConstructorArgs([
+                $this->state,
+                $this->storeNameFetcher,
+                $this->storeManager,
+                $this->jobResourceModel,
+                null
+            ])
+            ->onlyMethods($methodsToMock)
+            ->getMock();
+
+        return $cmd;
+    }
+
+    private function getMockSearchAdapter(): AdapterInterface&MockObject
+    {
+        $adapter = $this->createMock(AdapterInterface::class);
+        $select  = $this->createMock(Select::class);
+
+        // Build chainable select
+        $adapter->method('select')->willReturn($select);
+        $select->method('from')->willReturnSelf();
+        $select->method('where')->willReturnSelf();
+
+        return $adapter;
+    }
+
+    private function bufOut(): BufferedOutput
+    {
+        // Verbosity NORMAL is fine; change if you want debug output
+        return new BufferedOutput();
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    private function invokeExecute(ClearQueueCommand $cmd, $input, $output): int
+    {
+        return $this->invokeMethod($cmd, 'execute', [$input, $output]);
+    }
+
+}
diff --git a/Test/Unit/Helper/ConfigHelperTest.php b/Test/Unit/Helper/ConfigHelperTest.php
index 3e51bacbe..c4032556d 100644
--- a/Test/Unit/Helper/ConfigHelperTest.php
+++ b/Test/Unit/Helper/ConfigHelperTest.php
@@ -2,6 +2,7 @@
 
 namespace Algolia\AlgoliaSearch\Test\Unit\Helper;
 
+use Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper;
 use Algolia\AlgoliaSearch\Service\Serializer;
 use Algolia\AlgoliaSearch\Helper\Configuration\AutocompleteHelper;
 use Algolia\AlgoliaSearch\Helper\Configuration\InstantSearchHelper;
@@ -16,8 +17,8 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Locale\Currency;
 use Magento\Framework\Module\ResourceInterface;
-
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Weee\Helper\Data as WeeeHelper;
 use PHPUnit\Framework\TestCase;
 
 class ConfigHelperTest extends TestCase
@@ -38,6 +39,9 @@ class ConfigHelperTest extends TestCase
     protected ?CookieHelper $cookieHelper;
     protected ?AutocompleteHelper $autocompleteHelper;
     protected ?InstantSearchHelper $instantSearchHelper;
+    protected ?QueueHelper $queueHelper;
+
+    protected ?WeeeHelper $weeeHelper;
 
     protected function setUp(): void
     {
@@ -56,6 +60,8 @@ protected function setUp(): void
         $this->cookieHelper = $this->createMock(CookieHelper::class);
         $this->autocompleteHelper = $this->createMock(AutocompleteHelper::class);
         $this->instantSearchHelper = $this->createMock(InstantSearchHelper::class);
+        $this->queueHelper = $this->createMock(QueueHelper::class);
+        $this->weeeHelper = $this->createMock(WeeeHelper::class);
 
         $this->configHelper = new ConfigHelperTestable(
             $this->configInterface,
@@ -72,7 +78,9 @@ protected function setUp(): void
             $this->groupExcludedWebsiteRepository,
             $this->cookieHelper,
             $this->autocompleteHelper,
-            $this->instantSearchHelper
+            $this->instantSearchHelper,
+            $this->queueHelper,
+            $this->weeeHelper
         );
     }
 
diff --git a/Test/Unit/Helper/MathHelperTest.php b/Test/Unit/Helper/MathHelperTest.php
new file mode 100644
index 000000000..ad0845ed1
--- /dev/null
+++ b/Test/Unit/Helper/MathHelperTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Test\Unit\Helper;
+
+use Algolia\AlgoliaSearch\Helper\MathHelper;
+use PHPUnit\Framework\TestCase;
+
+class MathHelperTest extends TestCase
+{
+
+    /**
+     * @dataProvider averageProvider
+     */
+    public function testAverage($values, $expectedResult)
+    {
+        $this->assertEquals($expectedResult, MathHelper::getAverage($values));
+    }
+
+    /**
+     * @dataProvider standardDeviationProvider
+     */
+    public function testStandardDeviation($values, $expectedResult)
+    {
+        $this->assertEquals($expectedResult, MathHelper::getSampleStandardDeviation($values));
+    }
+
+    public static function averageProvider(): array
+    {
+        /** Tested with https://www.calculator.net/average-calculator.html */
+        return [
+            ['values' => [], 'expectedResult' => 0],
+            ['values' => [1, 3], 'expectedResult' => 2],
+            ['values' => ['foo' => 1, 'bar' => 3], 'expectedResult' => 2],
+            ['values' => [1, 9], 'expectedResult' => 5],
+            ['values' => [1, 2], 'expectedResult' => 1.5],
+            ['values' => [1, 2, 3], 'expectedResult' => 2],
+            ['values' => [1, 2, 4], 'expectedResult' => 2.33],
+            ['values' => [11253, 10025, 9521, 13250], 'expectedResult' => 11012.25],
+            ['values' => [10, 12, 23, 23, 16, 23, 21, 16], 'expectedResult' => 18],
+        ];
+    }
+
+    public static function standardDeviationProvider(): array
+    {
+        /** Tested with https://www.calculator.net/standard-deviation-calculator.html */
+        return [
+            ['values' => [], 'expectedResult' => 0.0],
+            ['values' => [1], 'expectedResult' => 0.0],
+            ['values' => [1, 1], 'expectedResult' => 0.0],
+            ['values' => [1, 3], 'expectedResult' => 1.41],
+            ['values' => [1, 4, 12], 'expectedResult' => 5.69],
+            ['values' => [3, 4, 6], 'expectedResult' => 1.53],
+            ['values' => [3, 4, 6, 8, 7, 11], 'expectedResult' => 2.88],
+            ['values' => [11253, 10025, 9521, 13250], 'expectedResult' => 1659.72],
+            ['values' => [10, 12, 23, 23, 16, 23, 21, 16], 'expectedResult' => 5.24],
+        ];
+    }
+}
diff --git a/Test/Unit/Service/Product/BatchQueueProcessorTest.php b/Test/Unit/Service/Product/BatchQueueProcessorTest.php
new file mode 100644
index 000000000..e1fb67d82
--- /dev/null
+++ b/Test/Unit/Service/Product/BatchQueueProcessorTest.php
@@ -0,0 +1,293 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Test\Unit\Service\Product;
+
+use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Algolia\AlgoliaSearch\Helper\Configuration\QueueHelper;
+use Algolia\AlgoliaSearch\Helper\Data;
+use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
+use Algolia\AlgoliaSearch\Model\Cache\Product\IndexCollectionSize;
+use Algolia\AlgoliaSearch\Model\IndexMover;
+use Algolia\AlgoliaSearch\Model\IndicesConfigurator;
+use Algolia\AlgoliaSearch\Model\Queue;
+use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
+use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor;
+use Algolia\AlgoliaSearch\Service\Product\IndexBuilder;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Exception\NoSuchEntityException;
+use PHPUnit\Framework\TestCase;
+
+class BatchQueueProcessorTest extends TestCase
+{
+    protected ?Data $dataHelper;
+    protected ?ConfigHelper $configHelper;
+    protected ?ProductHelper $productHelper;
+    protected ?QueueHelper $queueHelper;
+    protected ?Queue $queue;
+    protected ?DiagnosticsLogger $diag;
+    protected ?AlgoliaCredentialsManager $algoliaCredentialsManager;
+    protected ?IndexBuilder $indexBuilder;
+    protected ?IndexCollectionSize $indexCollectionSizeCache;
+    protected ?BatchQueueProcessor $processor;
+
+    protected function setUp(): void
+    {
+        $this->dataHelper = $this->createMock(Data::class);
+        $this->configHelper = $this->createMock(ConfigHelper::class);
+        $this->productHelper = $this->createMock(ProductHelper::class);
+        $this->queue = $this->createMock(Queue::class);
+        $this->diag = $this->createMock(DiagnosticsLogger::class);
+        $this->algoliaCredentialsManager = $this->createMock(AlgoliaCredentialsManager::class);
+        $this->indexBuilder = $this->createMock(IndexBuilder::class);
+        $this->indexCollectionSizeCache = $this->createMock(IndexCollectionSize::class);
+        $this->queueHelper = $this->createMock(QueueHelper::class);
+
+        $this->processor = new BatchQueueProcessor(
+            $this->dataHelper,
+            $this->configHelper,
+            $this->productHelper,
+            $this->queueHelper,
+            $this->queue,
+            $this->diag,
+            $this->algoliaCredentialsManager,
+            $this->indexBuilder,
+            $this->indexCollectionSizeCache
+        );
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchSkipsWhenIndexingDisabled()
+    {
+        $this->dataHelper->method('isIndexingEnabled')->willReturn(false);
+
+        $this->algoliaCredentialsManager->expects($this->never())->method('checkCredentialsWithSearchOnlyAPIKey');
+
+        $this->processor->processBatch(1);
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchSkipsWhenCredentialsInvalid()
+    {
+        $this->dataHelper->method('isIndexingEnabled')->willReturn(true);
+        $this->algoliaCredentialsManager->method('checkCredentialsWithSearchOnlyAPIKey')->willReturn(false);
+
+        $this->algoliaCredentialsManager->expects($this->once())
+            ->method('displayErrorMessage')
+            ->with(BatchQueueProcessor::class, 1);
+
+        $this->processor->processBatch(1);
+    }
+
+    /**
+     * @throws NoSuchEntityException
+     * @throws DiagnosticsException
+     */
+    public function testProcessBatchHandlesDeltaIndexing()
+    {
+        $this->setupBasicIndexingConfig(10);
+        $this->productHelper->method('getParentProductIds')->willReturn([]);
+
+        $this->queue->expects($this->once())
+            ->method('addToQueue')
+            ->with(
+                IndexBuilder::class,
+                'buildIndexList',
+                $this->arrayHasKey('entityIds')
+            );
+
+        $this->processor->processBatch(1, range(1,5));
+    }
+
+    public function testProcessBatchHandlesDeltaIndexingPaged()
+    {
+        $pageSize = 10;
+        $this->setupBasicIndexingConfig($pageSize);
+        $this->productHelper->method('getParentProductIds')->willReturn([]);
+
+        $invocationCount = 0;
+        $this->queue->expects($this->exactly(5))
+            ->method('addToQueue')
+            ->with(
+                IndexBuilder::class,
+                'buildIndexList',
+                $this->callback(function(array $arg) use (&$invocationCount, $pageSize) {
+                    $invocationCount++;
+                    return array_key_exists('storeId', $arg)
+                        && array_key_exists('entityIds', $arg)
+                        && array_key_exists('options', $arg)
+                        && $arg['options']['pageSize'] === $pageSize
+                        && $arg['options']['page'] === $invocationCount;
+                })
+            );
+
+        $this->processor->processBatch(1, range(1,50));
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchHandlesFullIndexing()
+    {
+        $this->setupBasicIndexingConfig(10);
+        $this->configHelper->method('isQueueActive')->willReturn(false);
+        $this->indexCollectionSizeCache->expects($this->once())->method('get')->willReturn(10);
+        $this->productHelper->method('getProductCollectionQuery')->willReturn($this->getMockCollection());
+        $this->queueHelper->method('useTmpIndex')->willReturn(false);
+
+        $invocationCount = 0;
+        $this->queue->expects($this->exactly(2))
+            ->method('addToQueue')
+            ->willReturnCallback(
+                function(
+                    string $className,
+                    string $method,
+                    array $data,
+                    int $dataSize,
+                    bool $isFullReindex)
+                use (&$invocationCount) {
+                    $invocationCount++;
+                    switch ($invocationCount) {
+                        case 1:
+                            $this->assertEquals(IndicesConfigurator::class, $className);
+                            $this->assertEquals('saveConfigurationToAlgolia', $method);
+                            $this->assertArrayHasKey('storeId', $data);
+                            break;
+                        case 2:
+                            $this->assertEquals(IndexBuilder::class, $className);
+                            $this->assertEquals('buildIndexFull', $method);
+                            $this->assertArrayHasKey('storeId', $data);
+                            break;
+                    }
+                }
+            );
+
+        $this->processor->processBatch(1);
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchFullIndexingWithNoCache()
+    {
+        $this->setupBasicIndexingConfig(10);
+        $this->configHelper->method('isQueueActive')->willReturn(false);
+        $this->indexCollectionSizeCache->expects($this->once())->method('get')->willReturn(IndexCollectionSize::NOT_FOUND);
+        $this->productHelper->method('getProductCollectionQuery')->willReturn($this->getMockCollection(10, 1));
+        $this->queueHelper->method('useTmpIndex')->willReturn(false);
+
+        $this->queue->expects($this->exactly(2))
+            ->method('addToQueue');
+
+        $this->processor->processBatch(1);
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchHandlesFullIndexingPaged()
+    {
+        $pageSize = 10;
+        $this->setupBasicIndexingConfig($pageSize);
+        $this->configHelper->method('isQueueActive')->willReturn(false);
+        $this->indexCollectionSizeCache->expects($this->once())->method('get')->willReturn(50);
+        $this->productHelper->method('getProductCollectionQuery')->willReturn($this->getMockCollection());
+        $this->queueHelper->method('useTmpIndex')->willReturn(false);
+
+        $invocationCount = 0;
+        $this->queue->expects($this->exactly(6))
+            ->method('addToQueue')
+            ->willReturnCallback(
+                function(
+                    string $className,
+                    string $method,
+                    array $data,
+                    int $dataSize,
+                    bool $isFullReindex)
+                use (&$invocationCount, $pageSize) {
+                    $invocationCount++;
+                    switch ($invocationCount) {
+                        case 1:
+                            $this->assertEquals(IndicesConfigurator::class, $className);
+                            $this->assertEquals('saveConfigurationToAlgolia', $method);
+                            break;
+                        default:
+                            $this->assertEquals(IndexBuilder::class, $className);
+                            $this->assertEquals('buildIndexFull', $method);
+                            $this->assertArrayHasKey('options', $data);
+                            $this->assertEquals($pageSize, $data['options']['pageSize']);
+                            $this->assertEquals($invocationCount - 1, $data['options']['page']);
+                            break;
+                    }
+                }
+            );
+
+        $this->processor->processBatch(1);
+    }
+
+    /**
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    public function testProcessBatchMovesTempIndexIfQueueActive()
+    {
+        $this->setupBasicIndexingConfig(10);
+        $this->configHelper->method('isQueueActive')->willReturn(true);
+        $this->indexCollectionSizeCache->expects($this->once())->method('get')->willReturn(10);
+
+        $this->productHelper->method('getProductCollectionQuery')->willReturn($this->getMockCollection());
+        $this->productHelper->method('getTempIndexName')->willReturn('tmp_index');
+        $this->productHelper->method('getIndexName')->willReturn('main_index');
+
+        $this->queueHelper->method('useTmpIndex')->willReturn(true);
+
+        $invocationCount = 0;
+        $this->queue->expects($this->exactly(3))
+            ->method('addToQueue')
+            ->willReturnCallback(
+                function(
+                    string $className,
+                    string $method,
+                    array $data,
+                    int $dataSize,
+                    bool $isFullReindex)
+                use (&$invocationCount) {
+                    $invocationCount++;
+                    if ($invocationCount === 3) {
+                        $this->assertEquals(IndexMover::class, $className);
+                        $this->assertEquals('moveIndexWithSetSettings', $method);
+                        $this->assertArrayHasKey('tmpIndexName', $data);
+                        $this->assertArrayHasKey('indexName', $data);
+                        $this->assertArrayHasKey('storeId', $data);
+                    }
+                }
+            );
+
+        $this->processor->processBatch(1);
+    }
+
+    protected function setupBasicIndexingConfig(int $elementsPerPage): void
+    {
+        $this->dataHelper->method('isIndexingEnabled')->willReturn(true);
+        $this->algoliaCredentialsManager->method('checkCredentialsWithSearchOnlyAPIKey')->willReturn(true);
+        $this->configHelper->method('getNumberOfElementByPage')->willReturn($elementsPerPage);
+        $this->configHelper->method('includeNonVisibleProductsInIndex')->willReturn(false);
+    }
+
+    protected function getMockCollection(int $size = 10, int $expectedSizeCalls = 0): Collection
+    {
+        $mockCollection = $this->createMock(Collection::class);
+        $mockCollection->expects($this->exactly($expectedSizeCalls))->method('getSize')->willReturn($size);
+        return $mockCollection;
+    }
+}
diff --git a/Ui/Component/Listing/Column/Data.php b/Ui/Component/Listing/Column/Data.php
index 2466a1b96..f6ffcd4da 100644
--- a/Ui/Component/Listing/Column/Data.php
+++ b/Ui/Component/Listing/Column/Data.php
@@ -53,7 +53,9 @@ protected function formatData(array $data, $depth = 0): string
 
                 continue;
             }
-
+            if (is_bool($value)) {
+               $value = $value ? 'Yes' : 'No';
+            }
             $formattedData .= str_repeat('&nbsp;&nbsp;&nbsp;', $depth ) . $stringKey . ' : ' . $value . '<br>';
         }
 
diff --git a/composer.json b/composer.json
index 3cc0eb501..3ad156dc2 100755
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "Algolia Search & Discovery extension for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.16.1",
+  "version": "3.17.0",
   "require": {
     "php": "~8.2|~8.3|~8.4",
     "magento/framework": "~103.0",
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index 60e6a16a8..21acfa5d2 100755
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -13,4 +13,10 @@
             <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
+        <plugin name="algolia_cache_clean_attribute_mass_action"
+                type="\Algolia\AlgoliaSearch\Plugin\Cache\CacheCleanBulkAttributePlugin"
+                sortOrder="1"
+        />
+    </type>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index cf5a6787c..d841cc003 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1038,6 +1038,23 @@
                     <validate>validate-digits</validate>
                     <label>Number of times to retry processing of queued jobs</label>
                     <source_model>Algolia\AlgoliaSearch\Model\Source\RetryValues</source_model>
+                    <comment>
+                        <![CDATA[
+                           Defines the number of times that the queue tries to process a job.
+                        ]]>
+                    </comment>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
+                </field>
+                <field id="use_tmp_index" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Use a temporary index for full products reindex</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>
+                        <![CDATA[
+                            This configuration defines if a temporary index suffixed by <code>_tmp</code> will be used for products full reindex. If you set it to "No", product updates will be sent directly to your production index.
+                        ]]>
+                    </comment>
                     <depends>
                         <field id="active">1</field>
                     </depends>
@@ -1437,6 +1454,16 @@
                         ]]>
                     </comment>
                 </field>
+                <field id="fpt_enable" translate="label comment" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Enable FPT</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>
+                        <![CDATA[
+                            Do you want to take into account Fixed Product Tax (FPT) configured on your products?
+                            <br><span class="algolia-config-warning">&#9888;</span> The extension will only take into account global FPT per country (state scoped FPT are not supported).
+                        ]]>
+                    </comment>
+                </field>
                 <field id="remove_pub_dir_in_url" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Remove pub/ from image URLs</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -1501,6 +1528,15 @@
                         ]]>
                     </comment>
                 </field>
+                <field id="number_of_element_by_page" translate="label comment" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <validate>validate-digits</validate>
+                    <label>Maximum number of records sent per indexing request</label>
+                    <comment>
+                        <![CDATA[
+                            Default value is 1000.
+                        ]]>
+                    </comment>
+                </field>
                 <field id="max_record_size_limit" translate="label comment" type="text" sortOrder="96" showInDefault="1">
                     <label>Max record size limit per record</label>
                     <comment>
@@ -1561,15 +1597,6 @@
                             Indexing Queue is enabled under the "Indexing Queue / Cron" tab.
                       ]]>
                 </comment>
-                <field id="number_of_element_by_page" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <validate>validate-digits</validate>
-                    <label>Maximum number of records processed per indexing job</label>
-                    <comment>
-                        <![CDATA[
-                            Default value is 300.
-                        ]]>
-                    </comment>
-                </field>
                 <field id="archive_clear_limit" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Archive log clean limit</label>
                     <comment>
diff --git a/etc/cache.xml b/etc/cache.xml
new file mode 100644
index 000000000..d52341e73
--- /dev/null
+++ b/etc/cache.xml
@@ -0,0 +1,6 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Cache/etc/cache.xsd">
+    <type name="algolia_indexer" translate="label,description" instance="Algolia\AlgoliaSearch\Model\Cache\Type\Indexer">
+        <label>Algolia Indexer</label>
+        <description>Algolia product indexing cache</description>
+    </type>
+</config>
diff --git a/etc/config.xml b/etc/config.xml
index 6ba636ca3..402cdc96b 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -7,17 +7,33 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
+        <!-- Credentials and Basic Setup -->
         <algoliasearch_credentials>
+            <credentials>
+                <enable_frontend>1</enable_frontend>
+                <debug>0</debug>
+                <index_prefix>magento2_</index_prefix>
+            </credentials>
             <algolia_cookie_configuration>
                 <default_consent_cookie_name>user_allowed_save_cookie</default_consent_cookie_name>
                 <allow_cookie_button_selector>#btn-cookie-allow</allow_cookie_button_selector>
                 <cookie_duration>15552000000</cookie_duration>
             </algolia_cookie_configuration>
         </algoliasearch_credentials>
+        <!-- Autocomplete Menu -->
         <algoliasearch_autocomplete>
             <autocomplete>
+                <is_popup_enabled>1</is_popup_enabled>
+                <autocomplete_selector>.algolia-search-input</autocomplete_selector>
+                <nb_of_products_suggestions>6</nb_of_products_suggestions>
+                <nb_of_categories_suggestions>2</nb_of_categories_suggestions>
+                <nb_of_queries_suggestions>0</nb_of_queries_suggestions>
+                <min_popularity>1000</min_popularity>
+                <min_number_of_results>2</min_number_of_results>
                 <sections><![CDATA[{"_1600351750374_374":{"name":"pages","label":"Pages","hitsPerPage":"2"}}]]></sections>
                 <excluded_pages><![CDATA[{"_1600351757831_831":{"attribute":"no-route"}}]]></excluded_pages>
+                <render_template_directives>1</render_template_directives>
+                <debug>0</debug>
                 <navigator>1</navigator>
                 <debounce_millisec>300</debounce_millisec>
                 <minimum_char_length>0</minimum_char_length>
@@ -28,8 +44,12 @@
                 <target>0</target>
             </redirects>
         </algoliasearch_autocomplete>
+        <!-- InstantSearch Results Page -->
         <algoliasearch_instant>
             <instant>
+                <is_instant_enabled>0</is_instant_enabled>
+                <instant_selector>.columns</instant_selector>
+                <number_product_results>9</number_product_results>
                 <replace_categories>0</replace_categories>
             </instant>
             <instant_facets>
@@ -42,6 +62,9 @@
             </instant_sorts>
             <instant_options>
                 <instantsearch_searchbox>1</instantsearch_searchbox>
+                <show_suggestions_on_no_result_page>1</show_suggestions_on_no_result_page>
+                <add_to_cart_enable>1</add_to_cart_enable>
+                <infinite_scroll_enable>0</infinite_scroll_enable>
                 <hide_pagination>0</hide_pagination>
             </instant_options>
             <instant_redirects>
@@ -49,28 +72,68 @@
                 <options>1,3</options>
             </instant_redirects>
         </algoliasearch_instant>
+        <!-- Products -->
         <algoliasearch_products>
             <products>
                 <product_additional_attributes><![CDATA[{"_1581608784535_535":{"attribute":"name","searchable":"1","order":"unordered","retrievable":"1"},"_1581608793630_630":{"attribute":"sku","searchable":"1","order":"unordered","retrievable":"1"},"_1582212731087_87":{"attribute":"manufacturer","searchable":"1","order":"unordered","retrievable":"1"},"_1582212739021_21":{"attribute":"categories","searchable":"1","order":"unordered","retrievable":"1"},"_1582212749587_587":{"attribute":"color","searchable":"1","order":"unordered","retrievable":"1"},"_1582212776086_86":{"attribute":"price","searchable":"2","order":"unordered","retrievable":"1"},"_1582212790407_407":{"attribute":"rating_summary","searchable":"2","order":"unordered","retrievable":"1"}}]]></product_additional_attributes>
                 <custom_ranking_product_attributes><![CDATA[{"_1600352070901_901":{"attribute":"in_stock","order":"desc"},"_1600352075148_148":{"attribute":"ordered_qty","order":"desc"},"_1600352080300_300":{"attribute":"created_at","order":"desc"}}]]></custom_ranking_product_attributes>
+                <use_adaptive_image>0</use_adaptive_image>
                 <enable_visual_merchandising>0</enable_visual_merchandising>
                 <category_page_id_attribute_name>categoryPageId</category_page_id_attribute_name>
                 <include_non_visible_products_in_index>0</include_non_visible_products_in_index>
             </products>
         </algoliasearch_products>
+        <!-- Categories -->
         <algoliasearch_categories>
             <categories>
                 <category_additional_attributes><![CDATA[{"_1582212881657_657":{"attribute":"name","searchable":"1","order":"unordered","retrievable":"1"},"_1582212904351_351":{"attribute":"path","searchable":"1","order":"unordered","retrievable":"1"},"_1582212910660_660":{"attribute":"meta_title","searchable":"1","order":"unordered","retrievable":"1"},"_1582212915890_890":{"attribute":"meta_keywords","searchable":"1","order":"unordered","retrievable":"1"},"_1582212922533_533":{"attribute":"meta_description","searchable":"1","order":"unordered","retrievable":"1"},"_1582212927307_307":{"attribute":"product_count","searchable":"2","order":"unordered","retrievable":"1"}}]]></category_additional_attributes>
                 <custom_ranking_category_attributes><![CDATA[{"_1600352142072_72":{"attribute":"product_count","order":"desc"}}]]></custom_ranking_category_attributes>
+                <show_cats_not_included_in_navigation>0</show_cats_not_included_in_navigation>
+                <index_empty_categories>0</index_empty_categories>
                 <category_separator> /// </category_separator>
             </categories>
         </algoliasearch_categories>
+        <!-- Recommend Products Settings -->
+        <algoliasearch_recommend>
+            <recommend>
+                <frequently_bought_together>
+                    <title>Frequently bought together</title>
+                    <num_of_frequently_bought_together_products>6</num_of_frequently_bought_together_products>
+                </frequently_bought_together>
+                <related_product>
+                    <title>Related products</title>
+                    <num_of_related_products>6</num_of_related_products>
+                </related_product>
+                <trends_item>
+                    <title>Trending items</title>
+                    <num_of_trending_items>6</num_of_trending_items>
+                </trends_item>
+                <looking_similar>
+                    <title>Looking Similar</title>
+                    <num_of_products>6</num_of_products>
+                </looking_similar>
+            </recommend>
+        </algoliasearch_recommend>
+        <!-- Images -->
+        <algoliasearch_images>
+            <image>
+                <width>265</width>
+                <height>265</height>
+                <type>image</type>
+            </image>
+        </algoliasearch_images>
+        <!-- Indexing Queue / Cron -->
         <algoliasearch_queue>
             <queue>
+                <active>0</active>
                 <use_built_in_cron>0</use_built_in_cron>
                 <cron_expr>*/5 * * * *</cron_expr>
+                <number_of_job_to_run>5</number_of_job_to_run>
+                <number_of_retries>3</number_of_retries>
+                <use_tmp_index>1</use_tmp_index>
             </queue>
         </algoliasearch_queue>
+        <!-- Indexing Manager -->
         <algoliasearch_indexing_manager>
             <algolia_indexing>
                 <enable_indexing>1</enable_indexing>
@@ -87,6 +150,16 @@
                 <queue>1</queue>
             </full_indexing>
         </algoliasearch_indexing_manager>
+        <!-- Click & Conversion Analytics -->
+        <algoliasearch_cc_analytics>
+            <cc_analytics_group>
+                <enable>0</enable>
+                <is_selector>.ais-Hits-item a.result, .ais-InfiniteHits-item a.result</is_selector>
+                <enable_conversion_analytics>disable</enable_conversion_analytics>
+                <add_to_cart_selector>.action.primary.tocart</add_to_cart_selector>
+            </cc_analytics_group>
+        </algoliasearch_cc_analytics>
+        <!-- Personalization -->
         <algoliasearch_personalization>
             <personalization_group>
                 <personalization_click_events_group>
@@ -98,28 +171,28 @@
                 </personalization_conversion_events_group>
             </personalization_group>
         </algoliasearch_personalization>
-        <algoliasearch_recommend>
-            <recommend>
-                <frequently_bought_together>
-                    <title>Frequently bought together</title>
-                    <num_of_frequently_bought_together_products>6</num_of_frequently_bought_together_products>
-                </frequently_bought_together>
-                <related_product>
-                    <title>Related products</title>
-                    <num_of_related_products>6</num_of_related_products>
-                </related_product>
-                <trends_item>
-                    <title>Trending items</title>
-                    <num_of_trending_items>6</num_of_trending_items>
-                </trends_item>
-                <looking_similar>
-                    <title>Looking Similar</title>
-                    <num_of_products>6</num_of_products>
-                </looking_similar>
-            </recommend>
-        </algoliasearch_recommend>
+        <!-- Google Analytics -->
+        <algoliasearch_analytics>
+            <analytics_group>
+                <enable>0</enable>
+                <delay>3000</delay>
+                <trigger_on_ui_interaction>1</trigger_on_ui_interaction>
+                <push_initial_search>0</push_initial_search>
+            </analytics_group>
+        </algoliasearch_analytics>
+        <!-- Advanced -->
         <algoliasearch_advanced>
             <advanced>
+                <remove_words_if_no_result>allOptional</remove_words_if_no_result>
+                <partial_update>0</partial_update>
+                <customer_groups_enable>0</customer_groups_enable>
+                <remove_pub_dir_in_url>0</remove_pub_dir_in_url>
+                <remove_branding>0</remove_branding>
+                <index_product_on_category_products_update>1</index_product_on_category_products_update>
+                <prevent_backend_rendering>0</prevent_backend_rendering>
+                <prevent_backend_rendering_display_mode>all</prevent_backend_rendering_display_mode>
+                <backend_rendering_allowed_user_agents>Googlebot\nBingbot</backend_rendering_allowed_user_agents>
+                <number_of_element_by_page>1000</number_of_element_by_page>
                 <max_record_size_limit>10000</max_record_size_limit>
                 <analytics_region>us</analytics_region>
                 <connection_timeout>2</connection_timeout>
@@ -130,7 +203,6 @@
                 <enable_profiler>0</enable_profiler>
             </advanced>
             <queue>
-                <number_of_element_by_page>300</number_of_element_by_page>
                 <archive_clear_limit>30</archive_clear_limit>
                 <enhanced_archive>0</enhanced_archive>
             </queue>
diff --git a/etc/di.xml b/etc/di.xml
index c494e3115..31dbd6a2c 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -2,10 +2,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Catalog\Model\ResourceModel\Product">
         <plugin name="algoliaProducts" type="Algolia\AlgoliaSearch\Model\Indexer\ProductObserver"/>
+        <plugin name="algoliaProductCacheClean" type="Algolia\AlgoliaSearch\Plugin\Cache\CacheCleanProductPlugin"/>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">
         <plugin name="algoliaProductsMassAction" type="Algolia\AlgoliaSearch\Model\Indexer\ProductObserver"/>
+        <plugin name="algoliaProductCacheCleanMassAction" type="Algolia\AlgoliaSearch\Plugin\Cache\CacheCleanProductPlugin"/>
     </type>
+
     <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
         <plugin name="algoliaStockItems" type="Algolia\AlgoliaSearch\Plugin\StockItemObserver" disabled="true"/>
     </type>
@@ -22,22 +25,24 @@
         <plugin name="algoliaSearchHelperData" type="Algolia\AlgoliaSearch\Plugin\SearchHelperDataPlugin"/>
     </type>
 
-    <!-- Dependency Injection for new Model -->
+    <!-- Algolia models -->
     <preference for="Algolia\AlgoliaSearch\Api\Data\JobInterface" type="Algolia\AlgoliaSearch\Model\Job" />
     <preference for="Algolia\AlgoliaSearch\Api\Data\LandingPageInterface" type="Algolia\AlgoliaSearch\Model\LandingPage" />
     <preference for="Algolia\AlgoliaSearch\Api\Data\QueryInterface" type="Algolia\AlgoliaSearch\Model\Query" />
     <preference for="Algolia\AlgoliaSearch\Api\RecommendManagementInterface" type="Algolia\AlgoliaSearch\Model\RecommendManagement" />
-
-    <!-- Declare preference for QueueArchiveRepositoryInterface -->
     <preference for="Algolia\AlgoliaSearch\Api\QueueArchiveRepositoryInterface" type="Algolia\AlgoliaSearch\Model\QueueArchiveRepository" />
-
-    <!-- Declare implementation for QueueArchiveInterface -->
     <preference for="Algolia\AlgoliaSearch\Api\Data\QueueArchiveInterface" type="Algolia\AlgoliaSearch\Model\QueueArchive" />
 
+    <!-- Algolia services -->
     <preference for="Algolia\AlgoliaSearch\Api\Insights\EventProcessorInterface" type="Algolia\AlgoliaSearch\Service\Insights\EventProcessor"/>
-
     <preference for="Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface" type="Algolia\AlgoliaSearch\Service\Product\ReplicaManager"/>
 
+    <type name="Algolia\AlgoliaSearch\Model\Indexer\Product">
+        <arguments>
+            <argument name="productBatchQueueProcessor" xsi:type="object">Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor</argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
             <argument name="collections" xsi:type="array">
@@ -45,6 +50,7 @@
                 <item name="algolia_algoliasearch_log_listing_data_source" xsi:type="string">Algolia\AlgoliaSearch\Model\ResourceModel\Run\Grid\Collection</item>
                 <item name="algolia_algoliasearch_landingpage_listing_data_source" xsi:type="string">Algolia\AlgoliaSearch\Model\ResourceModel\LandingPage\Grid\Collection</item>
                 <item name="algolia_algoliasearch_query_listing_data_source" xsi:type="string">Algolia\AlgoliaSearch\Model\ResourceModel\Query\Grid\Collection</item>
+                <item name="algolia_algoliasearch_queuearchive_listing_data_source" xsi:type="string">Algolia\AlgoliaSearch\Model\ResourceModel\QueueArchive\Grid\Collection</item>
             </argument>
         </arguments>
     </type>
@@ -132,13 +138,6 @@
         <plugin name="algoliasearch_query_quote_item_conversion" type="Algolia\AlgoliaSearch\Plugin\QuoteItem"/>
     </type>
 
-    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
-        <arguments>
-            <argument name="collections" xsi:type="array">
-                <item name="algolia_algoliasearch_queuearchive_listing_data_source" xsi:type="string">Algolia\AlgoliaSearch\Model\ResourceModel\QueueArchive\Grid\Collection</item>
-            </argument>
-        </arguments>
-    </type>
     <virtualType name="Algolia\AlgoliaSearch\Model\ResourceModel\QueueArchive\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
         <arguments>
             <argument name="mainTable" xsi:type="string">algoliasearch_queue_archive</argument>
@@ -148,45 +147,55 @@
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="replica_sync_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\ReplicaSyncCommand</item>
-                <item name="replica_delete_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\ReplicaDeleteCommand</item>
-                <item name="replica_rebuild_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\ReplicaRebuildCommand</item>
-                <item name="replica_disable_virtual_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\ReplicaDisableVirtualCommand</item>
-                <item name="synonym_deduplicate_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\SynonymDeduplicateCommand</item>
-                <!-- custom indexers -->
+                <!-- Replicas -->
+                <item name="replica_sync_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaSyncCommand</item>
+                <item name="replica_delete_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaDeleteCommand</item>
+                <item name="replica_rebuild_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaRebuildCommand</item>
+                <item name="replica_disable_virtual_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaDisableVirtualCommand</item>
+
+                <!-- Custom indexers -->
                 <item name="reindex_products_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexProductsCommand</item>
                 <item name="reindex_categories_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexCategoriesCommand</item>
                 <item name="reindex_pages_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexPagesCommand</item>
                 <item name="reindex_suggestions_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexSuggestionsCommand</item>
                 <item name="reindex_additional_sections_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexAdditionalSectionsCommand</item>
                 <item name="delete_products_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\DeleteProductsCommand</item>
-                <item name="process_queue_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\ProcessQueueCommand</item>
                 <item name="reindex_all_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Indexer\IndexAllCommand</item>
+
+                <!-- Queue processing-->
+                <item name="queue_process_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Queue\ProcessQueueCommand</item>
+                <item name="queue_clear_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\Queue\ClearQueueCommand</item>
+
+                <!-- Misc -->
+                <item name="synonym_deduplicate_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\SynonymDeduplicateCommand</item>
+                <item name="batching_optimize_command" xsi:type="object">Algolia\AlgoliaSearch\Console\Command\BatchingOptimizeCommand</item>
+
             </argument>
         </arguments>
     </type>
 
-    <type name="Algolia\AlgoliaSearch\Console\Command\ReplicaSyncCommand">
+    <!-- Replicas -->
+    <type name="Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaSyncCommand">
         <arguments>
             <argument name="replicaManager" xsi:type="object">Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface\Proxy</argument>
             <argument name="productHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\Entity\ProductHelper\Proxy</argument>
         </arguments>
     </type>
 
-    <type name="Algolia\AlgoliaSearch\Console\Command\ReplicaDeleteCommand">
+    <type name="Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaDeleteCommand">
         <arguments>
             <argument name="replicaManager" xsi:type="object">Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface\Proxy</argument>
         </arguments>
     </type>
 
-    <type name="Algolia\AlgoliaSearch\Console\Command\ReplicaRebuildCommand">
+    <type name="Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaRebuildCommand">
         <arguments>
             <argument name="replicaManager" xsi:type="object">Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface\Proxy</argument>
             <argument name="productHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\Entity\ProductHelper\Proxy</argument>
         </arguments>
     </type>
 
-    <type name="Algolia\AlgoliaSearch\Console\Command\ReplicaDisableVirtualCommand">
+    <type name="Algolia\AlgoliaSearch\Console\Command\Replica\ReplicaDisableVirtualCommand">
         <arguments>
             <argument name="configHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\ConfigHelper\Proxy</argument>
             <argument name="replicaManager" xsi:type="object">Algolia\AlgoliaSearch\Api\Product\ReplicaManagerInterface\Proxy</argument>
@@ -194,13 +203,6 @@
         </arguments>
     </type>
 
-    <type name="Algolia\AlgoliaSearch\Console\Command\SynonymDeduplicateCommand">
-        <arguments>
-            <argument name="algoliaConnector" xsi:type="object">Algolia\AlgoliaSearch\Service\AlgoliaConnector\Proxy</argument>
-            <argument name="indexOptionsBuilder" xsi:type="object">Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder\Proxy</argument>
-        </arguments>
-    </type>
-
     <!-- custom indexers -->
     <type name="Algolia\AlgoliaSearch\Console\Command\Indexer\IndexProductsCommand">
         <arguments>
@@ -238,19 +240,46 @@
             <argument name="storeNameFetcher" xsi:type="object">Algolia\AlgoliaSearch\Service\StoreNameFetcher\Proxy</argument>
         </arguments>
     </type>
-    <type name="Algolia\AlgoliaSearch\Console\Command\Indexer\ProcessQueueCommand">
+    <type name="Algolia\AlgoliaSearch\Console\Command\Indexer\IndexAllCommand">
+        <arguments>
+            <argument name="storeNameFetcher" xsi:type="object">Algolia\AlgoliaSearch\Service\StoreNameFetcher\Proxy</argument>
+        </arguments>
+    </type>
+    <!-- custom indexers END -->
+
+    <!-- queue handling -->
+    <type name="Algolia\AlgoliaSearch\Console\Command\Queue\ProcessQueueCommand">
         <arguments>
             <argument name="configHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\ConfigHelper\Proxy</argument>
             <argument name="queue" xsi:type="object">Algolia\AlgoliaSearch\Model\Queue\Proxy</argument>
             <argument name="algoliaCredentialsManager" xsi:type="object">Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager\Proxy</argument>
         </arguments>
     </type>
-    <type name="Algolia\AlgoliaSearch\Console\Command\Indexer\IndexAllCommand">
+    <type name="Algolia\AlgoliaSearch\Console\Command\Queue\ClearQueueCommand">
         <arguments>
             <argument name="storeNameFetcher" xsi:type="object">Algolia\AlgoliaSearch\Service\StoreNameFetcher\Proxy</argument>
         </arguments>
     </type>
-    <!-- custom indexers END -->
+
+    <!-- Misc commands -->
+    <type name="Algolia\AlgoliaSearch\Console\Command\SynonymDeduplicateCommand">
+        <arguments>
+            <argument name="algoliaConnector" xsi:type="object">Algolia\AlgoliaSearch\Service\AlgoliaConnector\Proxy</argument>
+            <argument name="indexOptionsBuilder" xsi:type="object">Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder\Proxy</argument>
+        </arguments>
+    </type>
+
+    <type name="Algolia\AlgoliaSearch\Console\Command\BatchingOptimizeCommand">
+        <arguments>
+            <argument name="algoliaConnector" xsi:type="object">Algolia\AlgoliaSearch\Service\AlgoliaConnector\Proxy</argument>
+            <argument name="storeNameFetcher" xsi:type="object">Algolia\AlgoliaSearch\Service\StoreNameFetcher\Proxy</argument>
+            <argument name="indexOptionsBuilder" xsi:type="object">Algolia\AlgoliaSearch\Service\Product\IndexOptionsBuilder\Proxy</argument>
+            <argument name="productHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\Entity\ProductHelper\Proxy</argument>
+            <argument name="recordBuilder" xsi:type="object">Algolia\AlgoliaSearch\Service\Product\RecordBuilder\Proxy</argument>
+            <argument name="configHelper" xsi:type="object">Algolia\AlgoliaSearch\Helper\ConfigHelper\Proxy</argument>
+        </arguments>
+    </type>
+
 
     <type name="Algolia\AlgoliaSearch\Logger\AlgoliaLogger">
         <arguments>
diff --git a/etc/module.xml b/etc/module.xml
index bd179ae67..f450526eb 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Algolia_AlgoliaSearch" setup_version="3.16.1">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.17.0">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>
diff --git a/view/frontend/web/js/template/autocomplete/products.js b/view/frontend/web/js/template/autocomplete/products.js
index 31a47d295..7ffd6e8e3 100644
--- a/view/frontend/web/js/template/autocomplete/products.js
+++ b/view/frontend/web/js/template/autocomplete/products.js
@@ -45,8 +45,8 @@ define([], function () {
 
         getColorHtml: function(item, components, html) {
             const highlight = this.safeHighlight(components, item, "color");
-            
-            return highlight 
+
+            return highlight
                 ? html`<span class="color">color: ${highlight}</span>`
                 : "";
         },
@@ -54,31 +54,31 @@ define([], function () {
         getCategoriesHtml: function(item, components, html) {
             const highlight = this.safeHighlight(components, item, "categories_without_path", false);
 
-            return highlight 
+            return highlight
                 ? html`<span>in ${highlight}</span>`
                 : "";
         },
 
         getOriginalPriceHtml: (item, html, priceGroup) => {
-            if (item['price'][algoliaConfig.currencyCode][priceGroup + '_original_formated'] == null) return "";
+            if (item['price']?.[algoliaConfig.currencyCode]?.[priceGroup + '_original_formated'] == null) return "";
 
             return html`<span class="before_special"> ${item['price'][algoliaConfig.currencyCode][priceGroup + '_original_formated']} </span>`;
         },
 
         getTierPriceHtml: (item, html, priceGroup) => {
-            if (item['price'][algoliaConfig.currencyCode][priceGroup + '_tier_formated'] == null) return "";
+            if (item['price']?.[algoliaConfig.currencyCode]?.[priceGroup + '_tier_formated'] == null) return "";
 
             return html`<span class="tier_price"> As low as <span class="tier_value">${item['price'][algoliaConfig.currencyCode][priceGroup + '_tier_formated']}</span></span>`;
         },
 
         getPricingHtml: function(item, html) {
-            if (item['price'] == undefined) return "";
+            if (item['price'] == null) return "";
 
             const priceGroup =  algoliaConfig.priceGroup || 'default';
 
             return html `<div className="algoliasearch-autocomplete-price">
-                <span className="after_special ${item['price'][algoliaConfig.currencyCode][priceGroup + '_original_formated'] != null ? 'promotion' : ''}">
-                    ${item['price'][algoliaConfig.currencyCode][priceGroup + '_formated']}
+                <span className="after_special ${item['price']?.[algoliaConfig.currencyCode]?.[priceGroup + '_original_formated'] != null ? 'promotion' : ''}">
+                    ${item['price']?.[algoliaConfig.currencyCode]?.[priceGroup + '_formated']}
                 </span>
                 ${this.getOriginalPriceHtml(item, html, priceGroup)}
 
@@ -87,7 +87,7 @@ define([], function () {
         },
 
         getFooterSearchCategoryLinks: (html, resultDetails) => {
-            if (resultDetails.allCategories == undefined || resultDetails.allCategories.length === 0) return "";
+            if (resultDetails.allCategories == null || resultDetails.allCategories.length === 0) return "";
 
             return html ` ${algoliaConfig.translations.orIn}
                 ${resultDetails.allCategories.map((list, index) =>