diff --git a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
index 85251d68d9db731b3f86c965a877da32c14b5a0c..0764ec6c64c29971ba9fefc9c5d4e57a6b897f71 100644
--- a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
+++ b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCompilerSettings.cmake 776624 2016-10-05 12:49:54Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 782946 2016-11-08 12:41:46Z alibrari $
 #
 # This file collects settings fine-tuning all the compiler and linker options
 # used in an ATLAS build in one place. It is included by default when using
@@ -100,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" )
    endforeach()
+   _add_flag( CMAKE_CXX_FLAGS_DEBUG "-fsanitize=undefined" )
 endif()
 foreach( mode RELEASE RELWITHDEBINFO DEBUG )
    _add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" )
diff --git a/Build/AtlasCMake/modules/Finddqm-common.cmake b/Build/AtlasCMake/modules/Finddqm-common.cmake
index 9b31a530b880bef088a4b1d08d91e86db933d527..3c3a8dfc386e9052ba35b353d6ecaf7f27fb0ea8 100644
--- a/Build/AtlasCMake/modules/Finddqm-common.cmake
+++ b/Build/AtlasCMake/modules/Finddqm-common.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Finddqm-common.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Finddqm-common.cmake 778185 2016-10-13 08:34:54Z alibrari $
 #
 # Try to find DQM-COMMON
 # Defines:
diff --git a/Build/AtlasCMake/modules/Findtdaq-common.cmake b/Build/AtlasCMake/modules/Findtdaq-common.cmake
index 6d2508a1ffe987221b84a5214c573b0f66cc9c10..5715f5e1fdc48e54d262fd359eda420c87051408 100644
--- a/Build/AtlasCMake/modules/Findtdaq-common.cmake
+++ b/Build/AtlasCMake/modules/Findtdaq-common.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Findtdaq-common.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Findtdaq-common.cmake 778185 2016-10-13 08:34:54Z alibrari $
 #
 # Try to find TDAQ-COMMON.
 # Defines:
diff --git a/Build/AtlasCMake/modules/Findtdaq.cmake b/Build/AtlasCMake/modules/Findtdaq.cmake
index 9784980dc3ddb137dfeb3b3250b69247eebd27dd..a7e1a540372a6f936084e377c828a602e4cad2e3 100644
--- a/Build/AtlasCMake/modules/Findtdaq.cmake
+++ b/Build/AtlasCMake/modules/Findtdaq.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Findtdaq.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Findtdaq.cmake 785934 2016-11-23 09:25:16Z elmsheus $
 #
 # Try to find TDAQ
 # Defines:
@@ -59,8 +59,13 @@ remove_definitions( -DHAVE_BOOL -DHAVE_DYNAMIC_CAST -DHAVE_NAMESPACES )
 # Add the RPM dependencies:
 if( TDAQ_FOUND )
    # Set up a dependency on the main tdaq RPM package:
-   set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
-      "tdaq-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+   if ( TDAQ_PROJECT_NAME )
+      set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
+                   "${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+   else()
+      set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
+      		    "tdaq-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+   endif()
 
 #   foreach( comp ${tdaq_FIND_COMPONENTS} )
 #      if( TDAQ_${comp}_FOUND )