diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 601210ac008..fec8a8e8c5d 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -10567,7 +10567,7 @@
 'rd_kafka_offset_tail' => ['int', 'cnt'=>'int'],
 'RdKafka::addBrokers' => ['int', 'broker_list'=>'string'],
 'RdKafka::flush' => ['int', 'timeout_ms'=>'int'],
-'RdKafka::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+'RdKafka::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
 'RdKafka::getOutQLen' => ['int'],
 'RdKafka::newQueue' => ['RdKafka\Queue'],
 'RdKafka::newTopic' => ['RdKafka\Topic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],
@@ -10582,7 +10582,7 @@
 'RdKafka\Conf::setStatsCb' => ['void', 'callback'=>'callable'],
 'RdKafka\Consumer::__construct' => ['void', 'conf='=>'?RdKafka\Conf'],
 'RdKafka\Consumer::addBrokers' => ['int', 'broker_list'=>'string'],
-'RdKafka\Consumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+'RdKafka\Consumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
 'RdKafka\Consumer::getOutQLen' => ['int'],
 'RdKafka\Consumer::newQueue' => ['RdKafka\Queue'],
 'RdKafka\Consumer::newTopic' => ['RdKafka\ConsumerTopic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],
@@ -10601,7 +10601,7 @@
 'RdKafka\KafkaConsumer::commitAsync' => ['void', 'message_or_offsets='=>'RdKafka\Message|RdKafka\TopicPartition[]|null'],
 'RdKafka\KafkaConsumer::consume' => ['RdKafka\Message', 'timeout_ms'=>'int'],
 'RdKafka\KafkaConsumer::getAssignment' => ['RdKafka\TopicPartition[]'],
-'RdKafka\KafkaConsumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\KafkaConsumerTopic', 'timeout_ms'=>'int'],
+'RdKafka\KafkaConsumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\KafkaConsumerTopic', 'timeout_ms'=>'int'],
 'RdKafka\KafkaConsumer::getSubscription' => ['array'],
 'RdKafka\KafkaConsumer::subscribe' => ['void', 'topics'=>'array'],
 'RdKafka\KafkaConsumer::unsubscribe' => ['void'],
@@ -10629,7 +10629,7 @@
 'RdKafka\Metadata\Topic::getTopic' => ['string'],
 'RdKafka\Producer::__construct' => ['void', 'conf='=>'?RdKafka\Conf'],
 'RdKafka\Producer::addBrokers' => ['int', 'broker_list'=>'string'],
-'RdKafka\Producer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+'RdKafka\Producer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
 'RdKafka\Producer::getOutQLen' => ['int'],
 'RdKafka\Producer::newQueue' => ['RdKafka\Queue'],
 'RdKafka\Producer::newTopic' => ['RdKafka\ProducerTopic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index 91089cbb26c..8acc9772488 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -5198,7 +5198,7 @@
     'RarException::setUsingExceptions' => ['RarEntry', 'using_exceptions'=>'bool'],
     'RdKafka::addBrokers' => ['int', 'broker_list'=>'string'],
     'RdKafka::flush' => ['int', 'timeout_ms'=>'int'],
-    'RdKafka::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+    'RdKafka::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
     'RdKafka::getOutQLen' => ['int'],
     'RdKafka::newQueue' => ['RdKafka\Queue'],
     'RdKafka::newTopic' => ['RdKafka\Topic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],
@@ -5213,7 +5213,7 @@
     'RdKafka\Conf::setStatsCb' => ['void', 'callback'=>'callable'],
     'RdKafka\Consumer::__construct' => ['void', 'conf='=>'?RdKafka\Conf'],
     'RdKafka\Consumer::addBrokers' => ['int', 'broker_list'=>'string'],
-    'RdKafka\Consumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+    'RdKafka\Consumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
     'RdKafka\Consumer::getOutQLen' => ['int'],
     'RdKafka\Consumer::newQueue' => ['RdKafka\Queue'],
     'RdKafka\Consumer::newTopic' => ['RdKafka\ConsumerTopic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],
@@ -5232,7 +5232,7 @@
     'RdKafka\KafkaConsumer::commitAsync' => ['void', 'message_or_offsets='=>'RdKafka\Message|RdKafka\TopicPartition[]|null'],
     'RdKafka\KafkaConsumer::consume' => ['RdKafka\Message', 'timeout_ms'=>'int'],
     'RdKafka\KafkaConsumer::getAssignment' => ['RdKafka\TopicPartition[]'],
-    'RdKafka\KafkaConsumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\KafkaConsumerTopic', 'timeout_ms'=>'int'],
+    'RdKafka\KafkaConsumer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\KafkaConsumerTopic', 'timeout_ms'=>'int'],
     'RdKafka\KafkaConsumer::getSubscription' => ['array'],
     'RdKafka\KafkaConsumer::subscribe' => ['void', 'topics'=>'array'],
     'RdKafka\KafkaConsumer::unsubscribe' => ['void'],
@@ -5260,7 +5260,7 @@
     'RdKafka\Metadata\Topic::getTopic' => ['string'],
     'RdKafka\Producer::__construct' => ['void', 'conf='=>'?RdKafka\Conf'],
     'RdKafka\Producer::addBrokers' => ['int', 'broker_list'=>'string'],
-    'RdKafka\Producer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'RdKafka\Topic', 'timeout_ms'=>'int'],
+    'RdKafka\Producer::getMetadata' => ['RdKafka\Metadata', 'all_topics'=>'bool', 'only_topic='=>'?RdKafka\Topic', 'timeout_ms'=>'int'],
     'RdKafka\Producer::getOutQLen' => ['int'],
     'RdKafka\Producer::newQueue' => ['RdKafka\Queue'],
     'RdKafka\Producer::newTopic' => ['RdKafka\ProducerTopic', 'topic_name'=>'string', 'topic_conf='=>'?RdKafka\TopicConf'],