Merge remote-tracking branch 'origin/MAUT-12306' into development

Author: escopecz

.github/workflows/tests.yml

@@ -139,7 +139,7 @@ jobs:
     #     verbose: true
 
     - name: Upload logs as artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mautic-logs
         path: var/logs/

Segment/Query/Filter/QueryFilterFactory.php

@@ -48,7 +48,10 @@ public function configureQueryBuilderFromSegmentFilter(array $segmentFilter, str
 
         $type = $segmentFilter->getQueryType();
 
-        if (CustomFieldFilterQueryBuilder::getServiceId() === $type) {
+        if (in_array($type, [
+            CustomFieldFilterQueryBuilder::getServiceId(),
+            CustomObjectMergedFilterQueryBuilder::getServiceId(),
+        ])) {
             $queryBuilder = $this->queryFilterHelper->createValueQuery(
                 $queryAlias,
                 $segmentFilter