diff --git a/Build/AtlasCMake/modules/Finddqm-common.cmake b/Build/AtlasCMake/modules/Finddqm-common.cmake
index 3c3a8dfc386e9052ba35b353d6ecaf7f27fb0ea8..675c65b14544f20fb44e895629761006e2dbe6a6 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 778185 2016-10-13 08:34:54Z alibrari $
+# $Id: Finddqm-common.cmake 790478 2016-12-19 13:20:23Z krasznaa $
 #
 # Try to find DQM-COMMON
 # Defines:
@@ -23,7 +23,8 @@ include( AtlasInternals )
 # Declare the module:
 atlas_external_module( NAME dqm-common
    INCLUDE_SUFFIXES installed/include INCLUDE_NAMES dqm_core/Algorithm.h
-   LIBRARY_SUFFIXES installed/${ATLAS_PLATFORM}/lib
+   LIBRARY_SUFFIXES installed/$ENV{CMTCONFIG}/lib
+   installed/${ATLAS_PLATFORM}/lib
    COMPULSORY_COMPONENTS dqm_core_io dqm_core dqm_dummy_io dqm_dummy )
 
 # Handle the standard find_package arguments:
@@ -37,9 +38,15 @@ mark_as_advanced( DQM-COMMON_FOUND DQM-COMMON_INCLUDE_DIR
 if( DQM-COMMON_FOUND )
    set( DQM-COMMON_PYTHON_PATH ${DQM-COMMON_ROOT}/installed/share/lib/python
       ${DQM-COMMON_LIBRARY_DIRS} )
-   set( DQM-COMMON_BINARY_PATH
-      ${DQM-COMMON_ROOT}/installed/${ATLAS_PLATFORM}/bin
-      ${DQM-COMMON_ROOT}/installed/share/bin )
+   if( "$ENV{CMTCONFIG}" STREQUAL "" )
+      set( DQM-COMMON_BINARY_PATH
+         ${DQM-COMMON_ROOT}/installed/${ATLAS_PLATFORM}/bin
+         ${DQM-COMMON_ROOT}/installed/share/bin )
+   else()
+      set( DQM-COMMON_BINARY_PATH
+         ${DQM-COMMON_ROOT}/installed/$ENV{CMTCONFIG}/bin
+         ${DQM-COMMON_ROOT}/installed/share/bin )
+   endif()
 endif()
 
 # Add the RPM dependencies:
diff --git a/Build/AtlasCMake/modules/Findtdaq-common.cmake b/Build/AtlasCMake/modules/Findtdaq-common.cmake
index 5715f5e1fdc48e54d262fd359eda420c87051408..5b88b22670d8e3a71e13ff95edfdf5d90ffe94a7 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 778185 2016-10-13 08:34:54Z alibrari $
+# $Id: Findtdaq-common.cmake 790478 2016-12-19 13:20:23Z krasznaa $
 #
 # Try to find TDAQ-COMMON.
 # Defines:
@@ -23,7 +23,8 @@ include( AtlasInternals )
 # Declare the module:
 atlas_external_module( NAME tdaq-common
    INCLUDE_SUFFIXES installed/include INCLUDE_NAMES eformat/eformat.h
-   LIBRARY_SUFFIXES installed/${ATLAS_PLATFORM}/lib
+   LIBRARY_SUFFIXES installed/$ENV{CMTCONFIG}/lib
+   installed/${ATLAS_PLATFORM}/lib
    COMPULSORY_COMPONENTS eformat ers )
 
 # Handle the standard find_package arguments:
@@ -37,9 +38,15 @@ mark_as_advanced( TDAQ-COMMON_FOUND TDAQ-COMMON_INCLUDE_DIR
 if( TDAQ-COMMON_FOUND )
    set( TDAQ-COMMON_PYTHON_PATH ${TDAQ-COMMON_ROOT}/installed/share/lib/python
       ${TDAQ-COMMON_LIBRARY_DIRS} )
-   set( TDAQ-COMMON_BINARY_PATH
-      ${TDAQ-COMMON_ROOT}/installed/${ATLAS_PLATFORM}/bin
-      ${TDAQ-COMMON_ROOT}/installed/share/bin )    
+   if( "$ENV{CMTCONFIG}" STREQUAL "" )
+      set( TDAQ-COMMON_BINARY_PATH
+         ${TDAQ-COMMON_ROOT}/installed/${ATLAS_PLATFORM}/bin
+         ${TDAQ-COMMON_ROOT}/installed/share/bin )
+   else()
+      set( TDAQ-COMMON_BINARY_PATH
+         ${TDAQ-COMMON_ROOT}/installed/$ENV{CMTCONFIG}/bin
+         ${TDAQ-COMMON_ROOT}/installed/share/bin )
+   endif()
 endif()
 
 # Add the RPM dependencies:
diff --git a/Build/AtlasCMake/modules/Findtdaq.cmake b/Build/AtlasCMake/modules/Findtdaq.cmake
index 71c322ba6cd56c630997e0df72d3894a542d38da..14172ca92ad6f035b8c65e8febd1d53fd22705c2 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 786558 2016-11-25 19:11:45Z fwinkl $
+# $Id: Findtdaq.cmake 790478 2016-12-19 13:20:23Z krasznaa $
 #
 # Try to find TDAQ
 # Defines:
@@ -24,7 +24,8 @@ include( AtlasInternals )
 # Declare the module:
 atlas_external_module( NAME tdaq
    INCLUDE_SUFFIXES installed/include INCLUDE_NAMES RunControl/RunControl.h
-   LIBRARY_SUFFIXES installed/${ATLAS_PLATFORM}/lib
+   LIBRARY_SUFFIXES installed/$ENV{CMTCONFIG}/lib
+   installed/${ATLAS_PLATFORM}/lib
    COMPULSORY_COMPONENTS ipc )
 
 # Add the platform specific header directory, if the platform agnostic directory
@@ -45,8 +46,13 @@ mark_as_advanced( TDAQ_FOUND TDAQ_INCLUDE_DIR TDAQ_INCLUDE_DIRS TDAQ_LIBRARIES
 if( TDAQ_FOUND )
    set( TDAQ_PYTHON_PATH ${TDAQ_ROOT}/installed/share/lib/python
       ${TDAQ_LIBRARY_DIRS} )
-   set( TDAQ_BINARY_PATH ${TDAQ_ROOT}/installed/${ATLAS_PLATFORM}/bin
-      ${TDAQ_ROOT}/installed/share/bin )
+   if( "$ENV{CMTCONFIG}" STREQUAL "" )
+      set( TDAQ_BINARY_PATH ${TDAQ_ROOT}/installed/${ATLAS_PLATFORM}/bin
+         ${TDAQ_ROOT}/installed/share/bin )
+   else()
+      set( TDAQ_BINARY_PATH ${TDAQ_ROOT}/installed/$ENV{CMTCONFIG}/bin
+         ${TDAQ_ROOT}/installed/share/bin )
+   endif()
    set( TDAQ_ENVIRONMENT
       SET    TDAQ_DB_PATH ${TDAQ_ROOT}/installed/share/data
       APPEND TDAQ_DB_PATH ${TDAQ_ROOT}/installed/databases