6 files changed, 29 insertions, 0 deletions
diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice
index 7b2489829cb..ebf60d3a15f 100644
--- a/cpp/test/Ice/optional/Test.ice
+++ b/cpp/test/Ice/optional/Test.ice
@@ -332,6 +332,8 @@ class Initial
     bool supportsCsharpSerializable();
 
     bool supportsCppStringView();
+
+    bool supportsNullOptional();
 };
 
 };
diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice
index 139c4962a99..5ae931827f9 100644
--- a/cpp/test/Ice/optional/TestAMD.ice
+++ b/cpp/test/Ice/optional/TestAMD.ice
@@ -333,6 +333,8 @@ class Initial
     bool supportsCsharpSerializable();
 
     bool supportsCppStringView();
+
+    bool supportsNullOptional();
 };
 
 };
diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp
index 817afefb905..be47d85f394 100644
--- a/cpp/test/Ice/optional/TestAMDI.cpp
+++ b/cpp/test/Ice/optional/TestAMDI.cpp
@@ -545,6 +545,13 @@ InitialI::supportsCppStringViewAsync(::std::function<void(bool)> response,
     response(true);
 }
 
+void
+InitialI::supportsNullOptionalAsync(::std::function<void(bool)> response,
+                                    ::std::function<void(::std::exception_ptr)>, const Ice::Current&)
+{
+    response(true);
+}
+
 
 #else // C++98 mapping
 
@@ -1012,4 +1019,10 @@ InitialI::supportsCppStringView_async(const ::Test::AMD_Initial_supportsCppStrin
     cb->ice_response(true);
 }
 
+void
+InitialI::supportsNullOptional_async(const ::Test::AMD_Initial_supportsNullOptionalPtr& cb, const Ice::Current&)
+{
+    cb->ice_response(true);
+}
+
 #endif
diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h
index c38e7301662..48bbe84452e 100644
--- a/cpp/test/Ice/optional/TestAMDI.h
+++ b/cpp/test/Ice/optional/TestAMDI.h
@@ -292,6 +292,8 @@ public:
     virtual void supportsCppStringViewAsync(::std::function<void(bool)>,
                                             ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override;
 
+    virtual void supportsNullOptionalAsync(::std::function<void(bool)>,
+                                           ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override;
 
 
 #else // C++98 mapping
@@ -515,6 +517,8 @@ public:
     virtual void supportsCppStringView_async(const ::Test::AMD_Initial_supportsCppStringViewPtr&,
                                              const Ice::Current&);
 
+    virtual void supportsNullOptional_async(const ::Test::AMD_Initial_supportsNullOptionalPtr&, const Ice::Current&);
+
 #endif
 
 };
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
index 1ebaf4afd93..46f76291366 100644
--- a/cpp/test/Ice/optional/TestI.cpp
+++ b/cpp/test/Ice/optional/TestI.cpp
@@ -560,3 +560,9 @@ InitialI::supportsCppStringView(const Ice::Current&)
 {
     return true;
 }
+
+bool
+InitialI::supportsNullOptional(const Ice::Current&)
+{
+    return true;
+}
diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h
index edd141ce2f5..b6fcdeb9dfc 100644
--- a/cpp/test/Ice/optional/TestI.h
+++ b/cpp/test/Ice/optional/TestI.h
@@ -267,6 +267,8 @@ public:
     virtual bool supportsCsharpSerializable(const Ice::Current&);
 
     virtual bool supportsCppStringView(const Ice::Current&);
+
+    virtual bool supportsNullOptional(const Ice::Current&);
 };
 
 #endif