Backport of https://github.com/hazelcast/hazelcast/pull/17578 from Java. (#633)
Backport of https://github.com/hazelcast/hazelcast/pull/17578 from Java. (#633)


hazelcast/hazelcast-cpp-client,hazelcast/hazelcast-cpp-client,hazelcast/hazelcast-cpp-client,hazelcast/hazelcast-cpp-client