diff --git a/README.md b/README.md
index 297efd60..8ad32cdd 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The library has been tested with MRI 3.1, 3.2 and 3.3. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.5.3"
+gem "couchbase", "3.5.4"
 ```
 
 And then execute:
diff --git a/bin/check-clang-static-analyzer b/bin/check-clang-static-analyzer
index 1e115e39..2179fa1a 100755
--- a/bin/check-clang-static-analyzer
+++ b/bin/check-clang-static-analyzer
@@ -16,10 +16,22 @@
 
 PROJECT_ROOT="$( cd "$(dirname "$0")/.." >/dev/null 2>&1 ; pwd -P )"
 
+DEFAULT_SCAN_BUILD=$(which scan-build)
+DEFAULT_CC=$(which clang)
+DEFAULT_CXX=$(which clang++)
+
+if command -v brew &> /dev/null
+then
+    LLVM_PREFIX=$(brew --prefix llvm)
+    DEFAULT_SCAN_BUILD=${LLVM_PREFIX}/bin/scan-build
+    DEFAULT_CC=${LLVM_PREFIX}/bin/clang
+    DEFAULT_CXX=${LLVM_PREFIX}/bin/clang++
+fi
+
 CB_CMAKE=${CB_CMAKE:-$(which cmake)}
-CB_CC=${CB_CC:-$(which clang)}
-CB_CXX=${CB_CXX:-$(which clang++)}
-CB_SCAN_BUILD=${CB_SCAN_BUILD:-$(which scan-build)}
+CB_CC=${CB_CC:-${DEFAULT_CC}}
+CB_CXX=${CB_CXX:-${DEFAULT_CXX}}
+CB_SCAN_BUILD=${CB_SCAN_BUILD:-${DEFAULT_SCAN_BUILD}}
 
 echo "CB_CC=${CB_CC}"
 echo "CB_CXX=${CB_CXX}"
@@ -44,8 +56,9 @@ ${CB_SCAN_BUILD} ${SCAN_BUILD_ARGS} ${CB_CMAKE} \
     -DENABLE_CACHE=OFF \
     -DRUBY_HDR_DIR="${RUBY_HDR_DIR}" \
     -DRUBY_ARCH_HDR_DIR="${RUBY_ARCH_HDR_DIR}" \
-    -DCOUCHBASE_CXX_CLIENT_INSTALL=ON \
-    -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON \
+    -DCOUCHBASE_CXX_CLIENT_INSTALL=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=OFF \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \
     -DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF \
     -DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
diff --git a/couchbase.gemspec b/couchbase.gemspec
index 0e69c640..95f686f2 100644
--- a/couchbase.gemspec
+++ b/couchbase.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     "homepage_uri" => "https://docs.couchbase.com/ruby-sdk/current/hello-world/start-using-sdk.html",
-    "bug_tracker_uri" => "https://issues.couchbase.com/browse/RCBC",
+    "bug_tracker_uri" => "https://jira.issues.couchbase.com/browse/RCBC",
     "mailing_list_uri" => "https://www.couchbase.com/forums/c/ruby-sdk",
     "source_code_uri" => "https://github.com/couchbase/couchbase-ruby-client/tree/#{spec.version}",
     "changelog_uri" => "https://github.com/couchbase/couchbase-ruby-client/releases/tag/#{spec.version}",
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index 5ed8d36c..efb35db2 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -63,6 +63,7 @@ add_library(
 target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated)
 target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR}
     ${PROJECT_SOURCE_DIR}/couchbase
+    ${PROJECT_BINARY_DIR}/couchbase/generated
     ${PROJECT_SOURCE_DIR}/couchbase/third_party/cxx_function
     ${PROJECT_SOURCE_DIR}/couchbase/third_party/expected/include)
 target_link_libraries(
diff --git a/ext/couchbase b/ext/couchbase
index 51f4775e..b7086c05 160000
--- a/ext/couchbase
+++ b/ext/couchbase
@@ -1 +1 @@
-Subproject commit 51f4775e56fb9ba975f92d7791d4d9feca336f05
+Subproject commit b7086c059659d3f1e03a8d9bff266fad0c6c9b89
diff --git a/lib/active_support/cache/couchbase_store.rb b/lib/active_support/cache/couchbase_store.rb
index 607d81a0..8d9c13ad 100644
--- a/lib/active_support/cache/couchbase_store.rb
+++ b/lib/active_support/cache/couchbase_store.rb
@@ -233,7 +233,7 @@ def write_entry(key, entry, raw: false, **options)
       end
 
       def write_serialized_entry(key, payload, expires_in: nil, race_condition_ttl: nil, raw: false, **)
-        if race_condition_ttl && expires_in && expires_in.positive? && !raw
+        if race_condition_ttl && expires_in&.positive? && !raw
           # Add few minutes to expiry in the future to support race condition TTLs on read
           expires_in += 5.minutes
         end
@@ -250,7 +250,7 @@ def write_multi_entries(entries, **options)
         return super if local_cache
 
         expires_in = options[:expires_in]
-        if options[:race_condition_ttl] && expires_in && expires_in.positive?
+        if options[:race_condition_ttl] && expires_in&.positive?
           # Add few minutes to expiry in the future to support race condition TTLs on read
           expires_in += 5.minutes
         end
diff --git a/lib/couchbase/version.rb b/lib/couchbase/version.rb
index 4267243f..be73e732 100644
--- a/lib/couchbase/version.rb
+++ b/lib/couchbase/version.rb
@@ -21,5 +21,5 @@ module Couchbase
   #   $ ruby -rcouchbase -e 'pp Couchbase::VERSION'
   #   {:sdk=>"3.4.0", :ruby_abi=>"3.1.0", :revision=>"416fe68e6029ec8a4c40611cf6e6b30d3b90d20f"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.5.3")
+  VERSION.update(:sdk => "3.5.4")
 end