diff --git a/CMakeLists.txt b/CMakeLists.txt
index b027ea5f7..b5626512a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,9 @@ option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting
 option(AUTO_GDK_FLUSH "Use gdk_flush on all gdk_thread_leave other than the GUI thread; set it ON if you experience X Server warning/errors" OFF)
 #option(TARGET32BIT "Build for 32-bit architecture when ON, otherwise 64-bit. Default is OFF" OFF)
 
+option(ENABLE_TCMALLOC "Use the tcmalloc library if available" OFF)
+set(TCMALLOC_LIB_DIR "" CACHE PATH "Custom path for the tcmalloc library")
+
 # Set installation directories:
 if(WIN32 OR APPLE)
     if(BUILD_BUNDLE)
@@ -564,6 +567,23 @@ int main()
     return 0;
 }" LENSFUN_HAS_LOAD_DIRECTORY)
 
+set(TCMALLOC_LIB_DIR)
+if(ENABLE_TCMALLOC)
+    if(TCMALLOC_LIB_DIR)
+        find_library(TCMALLOC_LIBRARIES tcmalloc PATHS ${TCMALLOC_LIB_DIR} NO_DEFAULT_PATH)
+    else()
+        find_library(TCMALLOC_LIBRARIES tcmalloc)
+    endif()
+    if(TCMALLOC_LIBRARIES)
+        message(STATUS "using tcmalloc library in ${TCMALLOC_LIBRARIES}")
+    else()
+        set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
+        message(STATUS "tcmalloc not found")
+    endif()
+else()
+    set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
+endif()
+
 
 add_subdirectory(rtexif)
 add_subdirectory(rtengine)
diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index e15a2bb0f..d2c68e2e8 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -4216,8 +4216,8 @@ void CLASS foveon_interpolate()
 	  foveon_avg (image[row*width]+c, dscr[1], cfilt) * 3
 	  - ddft[0][c][0] ) / 4 - ddft[0][c][1];
   }
-  memcpy (black, black+8, sizeof *black*8);
-  memcpy (black+height-11, black+height-22, 11*sizeof *black);
+  memmove (black, black+8, sizeof *black*8);
+  memmove (black+height-11, black+height-22, 11*sizeof *black);
   memcpy (last, black, sizeof last);
 
   for (row=1; row < height-1; row++) {
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 323d9e75c..522de81f4 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -4296,11 +4296,9 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
     if (params->labCurve.chromaticity > -100) {
         chCurve = new FlatCurve(params->labCurve.chcurve);
 
-        if (!chCurve || chCurve->isIdentity()) {
-            if (chCurve) {
-                delete chCurve;
-                chCurve = nullptr;
-            }
+        if (chCurve->isIdentity()) {
+            delete chCurve;
+            chCurve = nullptr;
         }//do not use "Munsell" if Chcurve not used
         else {
             chutili = true;
@@ -4313,11 +4311,9 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
     if (params->labCurve.chromaticity > -100) {
         lhCurve = new FlatCurve(params->labCurve.lhcurve);
 
-        if (!lhCurve || lhCurve->isIdentity()) {
-            if (lhCurve) {
-                delete lhCurve;
-                lhCurve = nullptr;
-            }
+        if (lhCurve->isIdentity()) {
+            delete lhCurve;
+            lhCurve = nullptr;
         }//do not use "Munsell" if Chcurve not used
         else {
             lhutili = true;
@@ -4330,11 +4326,9 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
     if (params->labCurve.chromaticity > -100) {
         hhCurve = new FlatCurve(params->labCurve.hhcurve);
 
-        if (!hhCurve || hhCurve->isIdentity()) {
-            if (hhCurve) {
-                delete hhCurve;
-                hhCurve = nullptr;
-            }
+        if (hhCurve->isIdentity()) {
+            delete hhCurve;
+            hhCurve = nullptr;
         }//do not use "Munsell" if Chcurve not used
         else {
             hhutili = true;
diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt
index fe55c7451..257d7fe77 100644
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -288,6 +288,7 @@ target_link_libraries(rth rtengine
     ${ZLIB_LIBRARIES}
     ${LENSFUN_LIBRARIES}
     ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
     )
 
 target_link_libraries(rth-cli rtengine
@@ -309,6 +310,7 @@ target_link_libraries(rth-cli rtengine
     ${ZLIB_LIBRARIES}
     ${LENSFUN_LIBRARIES}
     ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
     )
 
 # Install executables