MERGE: Merge branch '7.0' into master

Author: kdambekalns

Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php

@@ -73,7 +73,9 @@ public function buildMappingInformation(Index $index): MappingCollection
 
                 if (isset($propertyConfiguration['search']['elasticSearchMapping'])) {
                     if (is_array($propertyConfiguration['search']['elasticSearchMapping'])) {
-                        $propertyMapping = array_filter($propertyConfiguration['search']['elasticSearchMapping']);
+                        $propertyMapping = array_filter($propertyConfiguration['search']['elasticSearchMapping'], static function ($value) {
+                            return $value !== null;
+                        });
                         $mapping->setPropertyByPath($propertyName, $propertyMapping);
                     }
                 } elseif (isset($propertyConfiguration['type'], $this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping'])) {