Merge remote-tracking branch 'origin/2.4-develop' into ACPT-99-2

Author: aa-kashk

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -110,7 +110,7 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
 
         if (!empty($attributeCodes)) {
             $select->orWhere(
-                'a.attribute_code in (?) AND a.frontend_input = \'boolean\'',
+                'a.attribute_code in (?) AND a.frontend_input in (\'boolean\', \'price\')',
                 $attributeCodes
             );
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php

@@ -125,7 +125,7 @@ public function testAggregationCustomPriceAttribute()
         $priceAggregation = array_filter(
             $result['products']['aggregations'],
             function ($a) {
-                return $a['attribute_code'] == 'product_price_attribute_bucket';
+                return $a['attribute_code'] == 'product_price_attribute';
             }
         );
         $this->assertNotEmpty($priceAggregation);