diff --git a/inputFiles/solidMechanics/beamBending.ats b/inputFiles/solidMechanics/beamBending.ats
index 3ca10958216..f5347a1f844 100644
--- a/inputFiles/solidMechanics/beamBending.ats
+++ b/inputFiles/solidMechanics/beamBending.ats
@@ -31,7 +31,14 @@ decks = [
              partitions=partitions,
              restart_step=0,
              check_step=1,
-             restartcheck_params=restartcheck_params)
+             restartcheck_params=restartcheck_params),
+    TestDeck(name="beamBending_expect_failure",
+             description="Tests failure check.",
+             partitions=((1, 1, 1),),
+             restart_step=0,
+             check_step=1,
+             restartcheck_params=restartcheck_params,
+             curvecheck_params=curvecheck_params)
 ]
 
 generate_geos_tests(decks)
diff --git a/inputFiles/solidMechanics/beamBending_expect_failure.xml b/inputFiles/solidMechanics/beamBending_expect_failure.xml
new file mode 100644
index 00000000000..56c3d8b22af
--- /dev/null
+++ b/inputFiles/solidMechanics/beamBending_expect_failure.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Included>
+    <File name="./beamBending_base.xml"/>
+  </Included>
+
+  <!-- SPHINX_Gravity -->
+  <Solvers
+    gravityVector="{ 0.0, 0.0, 0.0 }">
+    <!-- SPHINX_GravityEnd -->
+    <!-- SPHINX_SolidMechanicsSolver -->
+    <SolidMechanicsLagrangianSSLE
+      name="incorrectSolverName"
+      timeIntegrationOption="QuasiStatic"
+      discretization="FE1"
+      targetRegions="{ mesh1/Region2 }"
+      >
+      <!-- SPHINX_SolidMechanicsSolverEnd -->
+      <NonlinearSolverParameters
+        newtonTol="1.0e-6"
+        newtonMaxIter="8"/>
+      <LinearSolverParameters
+        directParallel="0"/>
+    </SolidMechanicsLagrangianSSLE>
+  </Solvers>
+
+  <!-- SPHINX_FEDiscretization -->
+  <NumericalMethods>
+    <FiniteElements>
+      <FiniteElementSpace
+        name="FE1"
+        order="1"/>
+    </FiniteElements>
+  </NumericalMethods>
+
+  <!-- SPHINX_FEDiscretizationEnd -->
+
+  <!-- SPHINX_BeamBendingMesh -->
+  <Mesh>
+    <InternalMesh
+      name="mesh1"
+      elementTypes="{ C3D8 }"
+      xCoords="{ 0, 80 }"
+      yCoords="{ 0, 8 }"
+      zCoords="{ 0, 4 }"
+      nx="{ 80 }"
+      ny="{ 8 }"
+      nz="{ 4 }"
+      cellBlockNames="{ cb1 }"/>
+  </Mesh>
+
+</Problem>
diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh
index fbb33b328f9..422a4003916 100755
--- a/scripts/ci_build_and_test_in_container.sh
+++ b/scripts/ci_build_and_test_in_container.sh
@@ -302,6 +302,9 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
   if grep -q "Overall status: PASSED" "$tempdir/log_check.txt"; then
     echo "IntegratedTests passed. No rebaseline required."
     INTEGRATED_TEST_EXIT_STATUS=0
+  elif grep -q "Overall status: FAIL RUN" "$tempdir/log_check.txt"; then
+    echo "Some integratedTests failed to run. Skipping rebaseline process."
+    INTEGRATED_TEST_EXIT_STATUS=1
   else
     echo "IntegratedTests failed. Rebaseline is required."
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a5843f2a12..e1c40740138 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,7 +106,7 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/include DESTINATION . )
 # Generate version information
 ################################
 include( cmake/GeosxVersion.cmake )
-message( STATUS "Configuring GEOSX version ${GEOS_VERSION_FULL}" )
+message( STATUS "Configuring GEOSX version ${GEOSX_VERSION_FULL}" )
 
 
 ################################
@@ -127,7 +127,7 @@ if( ENABLE_CUDA )
   list( APPEND extraComponentsLinkList cuda )
 endif()
 
-if( ENABLE_CUDA AND ENABLE_CUDA_NVTOOLSEXT )
+if( ENABLE_CUDA_NVTOOLSEXT )
   list( APPEND extraComponentsLinkList CUDA::nvToolsExt )
 endif()
 
@@ -135,10 +135,15 @@ if( ENABLE_HIP )
   list( APPEND extraComponentsLinkList blt::hip )
 endif()
 
+if ( GEOSX_BUILD_SHARED_LIBS )
+  list( APPEND extraComponentsLinkList geosx_core )
+else()
+  list( APPEND extraComponentsLinkList ${geosx_core_libs} )
+endif()
+
 blt_add_executable( NAME geosx
                     SOURCES main/main.cpp
-                    DEPENDS_ON geosx_core 
-                               ${extraComponentsLinkList}
+                    DEPENDS_ON ${extraComponentsLinkList}
                                ${externalComponentsLinkList} )
 
 # Seems to be required on some CMake versions (e.g. 3.16) to get enforce device linking
@@ -146,6 +151,11 @@ if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA"  )
   set_target_properties( geosx PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS TRUE )
 endif()
 
+# Removing all transitive link dependencies from geosx_core target to circumvent
+# the BLT behavior which imposes all dependencies to be public
+#set_target_properties(geosx_core PROPERTIES INTERFACE_LINK_LIBRARIES "")
+
+target_include_directories( geosx PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
 
 # To change the runtime path during installation
 set_target_properties( geosx PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -211,7 +221,7 @@ add_custom_target( geosx_generate_install_schema
          COMMENT "Generating XML schema to install"
          )
 
-if( NOT GEOS_INSTALL_SCHEMA )
+if( NOT GEOSX_INSTALL_SCHEMA )
   set_target_properties(geosx_generate_install_schema PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
 endif()
 
@@ -222,8 +232,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
 ################################
 # Add python environment setup
 ################################
-# message(WARNING "Temporarily changing the geosPythonBranch to feature/packaging")
-# set(GEOS_PYTHON_PACKAGES_BRANCH "feature/packaging" CACHE STRING "" FORCE)
+message(WARNING "Temporarily changing the geosPythonBranch to feature/sherman/skipRebaselineFailRun")
+set(GEOS_PYTHON_PACKAGES_BRANCH "feature/sherman/skipRebaselineFailRun" CACHE STRING "" FORCE)
 
 
 if ( Python3_EXECUTABLE )
@@ -255,19 +265,19 @@ if ( Python3_EXECUTABLE )
       set(GEOS_PYTHON_PACKAGES_BRANCH "main" CACHE STRING "" FORCE)
     endif()
 
-    set( GEOS_PYTHON_TOOLS_BINS
+    set( GEOSX_PYTHON_TOOLS_BINS
          "${CMAKE_BINARY_DIR}/bin/preprocess_xml"
          "${CMAKE_BINARY_DIR}/bin/format_xml" )
 
-    add_custom_command( OUTPUT ${GEOS_PYTHON_TOOLS_BINS}
+    add_custom_command( OUTPUT ${GEOSX_PYTHON_TOOLS_BINS}
                         COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/setupPythonEnvironment.bash -p ${PYTHON_POST_EXECUTABLE} -b ${CMAKE_BINARY_DIR}/bin --python-pkg-branch ${GEOS_PYTHON_PACKAGES_BRANCH}
                         WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
 
     add_custom_target( geosx_python_tools
-                       DEPENDS ${GEOS_PYTHON_TOOLS_BINS} )
+                       DEPENDS ${GEOSX_PYTHON_TOOLS_BINS} )
 
     add_custom_target( geosx_python_tools_clean
-                       COMMAND rm ${GEOS_PYTHON_TOOLS_BINS} )
+                       COMMAND rm ${GEOSX_PYTHON_TOOLS_BINS} )
 
     add_custom_target( geosx_python_tools_test
                        COMMAND ${CMAKE_BINARY_DIR}/python/geosx/bin/test_geosx_xml_tools