diff --git a/Generators/Tauolapp_i/CMakeLists.txt b/Generators/Tauolapp_i/CMakeLists.txt
index 3ed58dfd82bfd7242c9b36e7499c2bec495949c5..66c883d0c6b25992cbbb0be3273ce449ea82b382 100644
--- a/Generators/Tauolapp_i/CMakeLists.txt
+++ b/Generators/Tauolapp_i/CMakeLists.txt
@@ -1,33 +1,19 @@
-################################################################################
-# Package: Tauolapp_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Tauolapp_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   Control/AthenaKernel
-   Database/AthenaPOOL/AthenaPoolUtilities
-   Event/EventInfo
-   GaudiKernel
-   Generators/AtlasHepMC
-   Generators/GeneratorObjects )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Tauolapp COMPONENTS TauolaFortran )
+find_package( Tauolapp COMPONENTS TauolaFortran TauolaHepMC )
 
 # Component(s) in the package:
 atlas_add_component( Tauolapp_i
    Tauolapp_i/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${TAUOLAPP_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-   
    LINK_LIBRARIES ${TAUOLAPP_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES}
-   AthenaBaseComps AthenaPoolUtilities EventInfo GaudiKernel GeneratorObjects )
+   AthenaBaseComps AthenaKernel AthenaPoolUtilities EventInfo GaudiKernel
+   GeneratorObjects )
 
 # Install files from the package:
-atlas_install_headers( Tauolapp_i )
 atlas_install_joboptions( share/*.py )
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx
index 0f689cc23df479b91e941bfc25dface7cc37b060..83f8aaa0af91464e7068c765d05476effc5fe4dd 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -19,6 +19,9 @@
 #include <boost/optional.hpp>
 #include <array>
 #include <climits>
+#include <iomanip>
+#include <set>
+#include <sstream>
 #include <unistd.h>
 
 using std::string;
@@ -204,14 +207,14 @@ std::string psc::Config::dumpOptions() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string psc::Config::getOption(const std::string& key) const 
+std::string psc::Config::getOption(const std::string& key) const
 {
-  std::map<std::string, std::string>::const_iterator it = optmap.find(key); 
+  std::map<std::string, std::string>::const_iterator it = optmap.find(key);
   if (it == optmap.end()) {
     ERS_PSC_WARNING("Could not find requested option = " << key) ;
     ERS_DEBUG(1, " " << dumpOptions() ) ;
     return "";
-  } 
+  }
   return it->second;
 }
 
@@ -227,7 +230,7 @@ std::string psc::Config::toPython(const std::string& dictName) const
       oss << ",";
     }
     oss << "'" << it->first << "':'" << it->second << "'";
-    first = false;         
+    first = false;
   }
   oss << "}" << std::endl;
   return oss.str();
diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt
index 46a0abb1c81491f948f61c4e1479b24f470b7ba9..a38c05f8816f374a07de2bbdd6380c92bbe49f8d 100644
--- a/Projects/AthDataQuality/CMakeLists.txt
+++ b/Projects/AthDataQuality/CMakeLists.txt
@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT
 find_package( AtlasCMake REQUIRED )
 
 # Build the project against LCG:
-set( LCG_VERSION_POSTFIX ""
+set( LCG_VERSION_POSTFIX "a_ATLAS_1"
    CACHE STRING "Version postfix for the LCG release to use" )
 set( LCG_VERSION_NUMBER 97
    CACHE STRING "Version number for the LCG release to use" )
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index ce567fe02c130c158fbf315ed565bb0f5fdfd724..26b6322843cfc0921664c4378e729ccb81c60eaf 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)
@@ -73,10 +73,10 @@ thisdir=$(cd ${thisdir};pwd)
 # Go to the main directory of the repository:
 cd ${thisdir}/../..
 
-{ 
+{
  test "X${NIGHTLY_STATUS}" != "X" && {
     scriptsdir_nightly_status=${NIGHTLY_STATUS_SCRIPTS}
-    test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status 
+    test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status
     test -x $scriptsdir_nightly_status/externals_status_on_exit.sh  && trap $scriptsdir_nightly_status/externals_status_on_exit.sh EXIT
  }
 }
@@ -132,7 +132,7 @@ AthGenerationExternalsVersion=$(awk '/^AthGenerationExternalsVersion/{print $3}'
 ${scriptsdir}/checkout_atlasexternals.sh \
     -t ${AthGenerationExternalsVersion} \
     -s ${BUILDDIR}/src/AthGenerationExternals 2>&1 | \
-    tee ${BUILDDIR}/src/checkout.AthGenerationExternals.log 
+    tee ${BUILDDIR}/src/checkout.AthGenerationExternals.log
 
 # log analyzer never affects return status in the parent shell:
 {
@@ -140,10 +140,10 @@ ${scriptsdir}/checkout_atlasexternals.sh \
     branch=$(basename $(cd .. ; pwd)) #FIXME: should be taken from env.
     timestamp_tmp=` basename ${BUILDDIR}/../.@@__* 2>/dev/null | sed 's,^\.,,' ` #to be used until the final stamp from ReleaseData is available
     test "X$timestamp_tmp" != "X" || {
-        timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ 
+        timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@
         touch ${BUILDDIR}/../.${timestamp_tmp}
     }
-   (set +e 
+   (set +e
     ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/src/checkout.AthGenerationExternals.log
    )
  } || true
@@ -160,9 +160,9 @@ ${scriptsdir}/build_atlasexternals.sh \
 
 {
  test "X${NIGHTLY_STATUS}" != "X" && {
-   (set +e 
-    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_config.log 
-    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_build.log 
+   (set +e
+    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_config.log
+    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_build.log
    )
  } || true
 }
@@ -180,7 +180,7 @@ ${scriptsdir}/checkout_Gaudi.sh \
     -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log
 
 {
- test "X${NIGHTLY_STATUS}" != "X" && { 
+ test "X${NIGHTLY_STATUS}" != "X" && {
    (set +e
     ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/src/checkout.GAUDI.log
    )
@@ -200,8 +200,8 @@ ${scriptsdir}/build_Gaudi.sh \
 {
  test "X${NIGHTLY_STATUS}" != "X" && {
    (set +e
-    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log 
-    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log 
+    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log
+    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log
    )
  } || true
 }
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index da06fa2d0fe961468a6e60fccb187dd0b67e20b2..640a10702acefce7155092f564fe5b385b74931d 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 42958c9bddf44a8e2fe269842645d0fabfb03cda..2403fa9c7198c93101b3db7cdadb3beebd949f4f 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -31,9 +31,9 @@ if( LCG_NIGHTLY )
     set( TDAQ_VERSION "99-00-00" CACHE STRING
        "The version of tdaq to use for the build" )
 else()
-    set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING
+    set( TDAQ-COMMON_VERSION "04-01-01" CACHE STRING
        "The version of tdaq-common to use for the build" )
-    set( TDAQ_VERSION "09-00-00" CACHE STRING
+    set( TDAQ_VERSION "09-01-01" CACHE STRING
        "The version of tdaq to use for the build" )
 endif()
 
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 6ad6ab29730792933233bb800793540a868ac83f..6929a21c2e76d3f37fdf1c657685513906213bae 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
 while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)
@@ -73,10 +73,10 @@ thisdir=$(cd ${thisdir};pwd)
 # Go to the main directory of the repository:
 cd ${thisdir}/../..
 
-{ 
+{
  test "X${NIGHTLY_STATUS}" != "X" && {
     scriptsdir_nightly_status=${NIGHTLY_STATUS_SCRIPTS}
-    test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status 
+    test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status
     test -x $scriptsdir_nightly_status/externals_status_on_exit.sh  && trap $scriptsdir_nightly_status/externals_status_on_exit.sh EXIT
  }
 }
@@ -131,7 +131,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex
 # Check out AthenaExternals from the right branch/tag:
 ${scriptsdir}/checkout_atlasexternals.sh \
     -t ${AthenaExternalsVersion} \
-    -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log 
+    -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log
 
 # log analyzer never affects return status in the parent shell:
 {
@@ -139,10 +139,10 @@ ${scriptsdir}/checkout_atlasexternals.sh \
     branch=$(basename $(cd .. ; pwd)) #FIXME: should be taken from env.
     timestamp_tmp=` basename ${BUILDDIR}/../.@@__* 2>/dev/null | sed 's,^\.,,' ` #to be used until the final stamp from ReleaseData is available
     test "X$timestamp_tmp" != "X" || {
-        timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ 
+        timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@
         touch ${BUILDDIR}/../.${timestamp_tmp}
     }
-   (set +e 
+   (set +e
     ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/src/checkout.AthenaExternals.log
    )
  } || true
@@ -160,9 +160,9 @@ ${scriptsdir}/build_atlasexternals.sh \
 
 {
  test "X${NIGHTLY_STATUS}" != "X" && {
-   (set +e 
-    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_config.log 
-    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_build.log 
+   (set +e
+    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_config.log
+    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_build.log
    )
  } || true
 }
@@ -180,7 +180,7 @@ ${scriptsdir}/checkout_Gaudi.sh \
     -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log
 
 {
- test "X${NIGHTLY_STATUS}" != "X" && { 
+ test "X${NIGHTLY_STATUS}" != "X" && {
    (set +e
     ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/src/checkout.GAUDI.log
    )
@@ -200,8 +200,8 @@ ${scriptsdir}/build_Gaudi.sh \
 {
  test "X${NIGHTLY_STATUS}" != "X" && {
    (set +e
-    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log 
-    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log 
+    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log
+    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log
    )
  } || true
 }
diff --git a/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake b/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
index ee66e186583fe405043d59de63f7be1cad93f1db..407af5d972f536b78c8aa8b9a0c5c60364fc19ed 100644
--- a/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
+++ b/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
@@ -3,10 +3,16 @@
 # Module for setting up the runtime environment for numpy from an LCG release.
 #
 
+# Decide whether or not to pass "QUIET" to the subsequent find_package call(s).
+set( _quietFlag )
+if( NumPyEnvironment_FIND_QUIETLY )
+  set( _quietFlag QUIET )
+endif()
+
 # Find the lapack installation that's part of LCG. Note that this call finds the
 # CMake configuration included in the LAPACK installation, it does *not* use
 # CMake's FindLAPACK.cmake module.
-find_package( lapack )
+find_package( lapack ${_quietFlag} )
 
 # Extract the path of the library pointed to by the "lapack" imported library.
 if( lapack_FOUND )
diff --git a/Projects/VP1Light/build_externals.sh b/Projects/VP1Light/build_externals.sh
index 4b83f43b313b6841ff8599a7418ea5a6a561824e..e2b5c3881f9051696fbea361d078a08523f140cc 100755
--- a/Projects/VP1Light/build_externals.sh
+++ b/Projects/VP1Light/build_externals.sh
@@ -26,7 +26,7 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-EXTRACMAKE=()
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
 while getopts ":t:b:fch" opt; do
     case $opt in
         t)
diff --git a/Reconstruction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx b/Reconstruction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx
index 6f2118c75caad1934a142527c53d48edc1759901..857d9f1f908e3b338bd31f1e822f8f8e9c8db977 100644
--- a/Reconstruction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // Source code for the ConstituentSubtractorTool implementation class
@@ -45,7 +45,7 @@ StatusCode ConstituentSubtractorTool::initialize() {
 
 
 // Apply PU weighting and decorate the CaloCluster container appropriately:
-	
+
 StatusCode ConstituentSubtractorTool::process_impl(xAOD::IParticleContainer* cont) const {
 
   contrib::ConstituentSubtractor subtractor;
@@ -53,7 +53,7 @@ StatusCode ConstituentSubtractorTool::process_impl(xAOD::IParticleContainer* con
   subtractor.set_alpha(m_alpha);  // free parameter for the distance measure (the exponent of particle pt). The larger the parameter alpha, the more are favoured the lower pt particles in the subtraction process
   subtractor.set_ghost_area(0.01); // free parameter for the density of ghosts. The smaller, the better - but also the computation is slower.
 
-  // prepare PseudoJet input from 
+  // prepare PseudoJet input from
   std::vector<PseudoJet>  full_event; full_event.reserve( cont->size() );
   size_t i =0; // Corresponds to the index in the input container
   // We don't use part->index() because it might be a view container
@@ -113,18 +113,15 @@ StatusCode ConstituentSubtractorTool::process_impl(xAOD::IParticleContainer* con
   bge_rho.set_particles(full_event);
   subtractor.set_background_estimator(&bge_rho);
 
-  // this sets the same background estimator to be used for deltaMass density, rho_m, as for pt density, rho:
-  subtractor.set_common_bge_for_rho_and_rhom(false); // for massless input particles it does not make any difference (rho_m is always zero)
-
   std::vector<PseudoJet> corrected_event=subtractor.subtract_event(full_event,m_maxEta);
-  
+
   // Define a vector holding the corrected four-momenta for all output constituents
   // This is defaulted to zero, because fastjet will only return non-zero pseudojets
   std::vector<xAOD::JetFourMom_t> corrected_p4s(cont->size(),xAOD::JetFourMom_t(0.,0.,0.,0.));
   // Set the corrected four-vectors
   for(PseudoJet & pj : corrected_event) {
     ATH_MSG_VERBOSE("Setting four-mom for constituent " << pj.user_index() << ", pt = " << pj.pt());
-    corrected_p4s[pj.user_index()].SetCoordinates(pj.pt(),pj.eta(),pj.phi(),pj.m());    
+    corrected_p4s[pj.user_index()].SetCoordinates(pj.pt(),pj.eta(),pj.phi(),pj.m());
   }
 
   // Set every constituent's four-vector
@@ -137,8 +134,7 @@ StatusCode ConstituentSubtractorTool::process_impl(xAOD::IParticleContainer* con
     ATH_MSG_VERBOSE("Initial phi: " << part->phi() << ", subtracted pt: " << corrected_p4s[i].Phi());
     ATH_CHECK( setP4(part,corrected_p4s[i], &weightAcc) );
     ++i;
-  }  
+  }
 
   return StatusCode::SUCCESS;
 }
-