diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 9fdceb7516c169b41510497f4e5c7a94f215a241..24c73abbdc3d476c8dd0f01a3336ad3db0a88606 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.2
+AnalysisBaseExternalsVersion = 2.0.3
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index 8e91a9213221448be285fecb387f78f512acb894..e659c9dca5374955aca386b2daa93bc5938de19a 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = 2.0.2
+AnalysisBaseExternalsVersion = 2.0.3
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index f183b1331e1c0ba9e953486a904532f7e8b0cc50..fb63068a5b1dfd7e80d55c55a131561845ebcbb7 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.2
+AtlasExternalsVersion = 2.0.3
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index b175ef493ea807eacc550059f59e1c15a6c9f199..c5dc776065e759fbba154943f7b56c9bd2be41c2 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 8bb3de80
+AthSimulationExternalsVersion = 2.0.3
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v30r2.001
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 022a6bb9c6db1a031c66e1fad80906d891937f00..317c0579d6b82bf8aa1290e97fe9bcbf12e1a010 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -24,8 +24,8 @@ if( LCG_NIGHTLY )
     set( DQM-COMMON_VERSION "99-00-00" )
     set( TDAQ_VERSION "99-00-00" )
 else()
-    set( TDAQ-COMMON_VERSION "02-04-00" )
-    set( DQM-COMMON_VERSION "01-04-00" )
+    set( TDAQ-COMMON_VERSION "02-06-00" )
+    set( DQM-COMMON_VERSION "01-06-00" )
     set( TDAQ_VERSION "07-01-00" )
 endif()
 
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 94bb6efd3e44a7633b32df8a6743321bcc51360d..61d61aa373f091bd59ce0b803ec9ccfb5de6dd9e 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 8bb3de80
+AthenaExternalsVersion = 2.0.3
 
 # The version of atlas/Gaudi to use: 
 GaudiVersion = v30r2.001
diff --git a/Projects/Athena/externals/Rivet.cmake b/Projects/Athena/externals/Rivet.cmake
index 64c516a852f83c23d268b642d43a7b083d4b367d..6ef04ba05c8d054f320b60be3ab25adb4663cc2f 100644
--- a/Projects/Athena/externals/Rivet.cmake
+++ b/Projects/Athena/externals/Rivet.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Rivet to use.
 #
 
-set( RIVET_VERSION 2.5.3 )
+set( RIVET_VERSION 2.6.0 )
 set( RIVET_ROOT
    ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/YODA.cmake b/Projects/Athena/externals/YODA.cmake
index 9d7213d9cd010538e07fc581667dae8ffc240a48..5c4f7b407c391d984605c9a8f2b51e9cc25252f3 100644
--- a/Projects/Athena/externals/YODA.cmake
+++ b/Projects/Athena/externals/YODA.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of YODA to use.
 #
 
-set( YODA_VERSION 1.6.6 )
+set( YODA_VERSION 1.7.0 )
 set( YODA_ROOT
    ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
index b8bc098e62e5ca88fb1855902768a977cc4396d2..0949573db046d029d2c93162172433889b467773 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP13DCocktailPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWid
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp13dcocktailplugin_vp1autofactory, VP13DCocktailPlugin_VP1AutoFactory)
   #endif
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
index e3f4b9ea979021b767e9a141bd798e80b91b2c3a..b317e56342650e86e4506ba1a708e3beb0ce807d 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP1TrackCaloPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidg
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1trackcaloplugin_vp1autofactory, VP1TrackCaloPlugin_VP1AutoFactory)
   #endif
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
index 17d5527741f32ca27c101f8f54d3987be8e8f953..0c22e42cee9181fb24a60a2918a4bdaca15f1600 100644
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP1AODPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidgetFact
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1AODPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1AODPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1aodplugin_vp1autofactory, VP1AODPlugin_VP1AutoFactory)
   #endif
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
index 504ecf7636c973992077772797b4170078c8448c..acf53538f4349e44b59a313a02a08c532e03327b 100644
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
@@ -13,7 +13,7 @@ class VP1GeometryPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidge
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1geometryplugin_vp1autofactory, VP1GeometryPlugin_VP1AutoFactory)
   #endif