diff --git a/.github/release-tag.yml b/.github/release-tag.yml
index 7da4bc0533627..31320a63f2a90 100644
--- a/.github/release-tag.yml
+++ b/.github/release-tag.yml
@@ -1,2 +1,2 @@
-tag: xpv3.14.0.4
-message: "xpro version 3.14.0.4 tag"
+tag: xpv3.14.0.5
+message: "xpro version 3.14.0.5 tag"
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index f3b309e99bc3f..248c8ec1721f7 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -140,11 +140,6 @@ if(DEFINED XP_NAMESPACE)
 else()
   set(CMAKE_NAMESPACE protobuf)
   set(CMAKE_OPT_INSTALL TRUE)
-  if(NOT MSVC)
-    set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf")
-  else()
-    set(CMAKE_INSTALL_CMAKEDIR "cmake")
-  endif()
 endif()
 
 add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 8c216d43035cf..4ea2c373a0408 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -104,11 +104,15 @@ endforeach()
 
 # Install configuration
 set(_cmakedir_desc "Directory relative to CMAKE_INSTALL to install the cmake configuration files")
+if(DEFINED CMAKE_INSTALL_CMAKEDIR)
+  set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}" CACHE STRING "${_cmakedir_desc}")
+else()
 if(NOT MSVC)
   set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf" CACHE STRING "${_cmakedir_desc}")
 else()
   set(CMAKE_INSTALL_CMAKEDIR "cmake" CACHE STRING "${_cmakedir_desc}")
 endif()
+endif()
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 configure_file(protobuf-config.cmake.in