diff --git a/hazelcast/include/hazelcast/client/HazelcastClient.h b/hazelcast/include/hazelcast/client/HazelcastClient.h
index 5d17955349..260822bf9d 100644
--- a/hazelcast/include/hazelcast/client/HazelcastClient.h
+++ b/hazelcast/include/hazelcast/client/HazelcastClient.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include <boost/utility/string_view.hpp>
+
 #include "hazelcast/client/impl/HazelcastClientInstanceImpl.h"
 
 #if  defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
@@ -289,11 +291,24 @@ namespace hazelcast {
              */
             spi::LifecycleService &getLifecycleService();
 
+            /**
+             *
+             * @return the CP subsystem that offers a set of in-memory linearizable data structures
+             */
             cp::cp_subsystem &get_cp_subsystem();
+
         private:
             std::shared_ptr<impl::HazelcastClientInstanceImpl> clientImpl;
         };
 
+        /**
+         *
+         * @return the version of the client
+         */
+        constexpr boost::string_view version() {
+            return HAZELCAST_VERSION;
+        }
+
     }
 }
 
diff --git a/hazelcast/test/src/HazelcastTests1.cpp b/hazelcast/test/src/HazelcastTests1.cpp
index b69248bc8e..82871876dd 100644
--- a/hazelcast/test/src/HazelcastTests1.cpp
+++ b/hazelcast/test/src/HazelcastTests1.cpp
@@ -896,11 +896,6 @@ namespace hazelcast {
     }
 }
 
-
-
-
-
-
 namespace hazelcast {
     namespace client {
         namespace test {
@@ -1043,10 +1038,6 @@ namespace hazelcast {
     }
 }
 
-
-
-
-
 namespace hazelcast {
     namespace client {
         namespace test {
@@ -1111,9 +1102,6 @@ namespace hazelcast {
     }
 }
 
-
-
-
 namespace hazelcast {
     namespace client {
         namespace test {
@@ -1140,9 +1128,6 @@ namespace hazelcast {
     }
 }
 
-
-
-
 namespace hazelcast {
     namespace client {
         namespace test {
@@ -2787,8 +2772,6 @@ namespace hazelcast {
     }
 }
 
-
-
 namespace hazelcast {
     namespace client {
         namespace test {
diff --git a/hazelcast/test/src/HazelcastTests5.cpp b/hazelcast/test/src/HazelcastTests5.cpp
index 97947b4430..f61ff2c00a 100644
--- a/hazelcast/test/src/HazelcastTests5.cpp
+++ b/hazelcast/test/src/HazelcastTests5.cpp
@@ -341,7 +341,6 @@ namespace hazelcast {
 }
 */
 
-
 namespace hazelcast {
     namespace client {
 
@@ -389,7 +388,6 @@ namespace hazelcast {
     }
 }
 
-
 namespace hazelcast {
     namespace client {
 
@@ -505,7 +503,6 @@ namespace hazelcast {
     }
 }
 
-
 namespace hazelcast {
     namespace client {
 
diff --git a/hazelcast/test/src/HazelcastTests8.cpp b/hazelcast/test/src/HazelcastTests8.cpp
index 3497ac7f7d..a6acb8d1f1 100644
--- a/hazelcast/test/src/HazelcastTests8.cpp
+++ b/hazelcast/test/src/HazelcastTests8.cpp
@@ -1607,6 +1607,11 @@ namespace hazelcast {
 namespace hazelcast {
     namespace client {
         namespace test {
+            class VersionTest: public ClientTestSupport {};
+            TEST_F(VersionTest, test_client_version) {
+                ASSERT_EQ(HAZELCAST_VERSION, version());
+            }
+
             class ClientMessageTest: public ClientTestSupport {
             protected:
                 struct BufferedMessageHandler {