diff --git a/etc/config.csh/ADIOS b/etc/config.csh/ADIOS
index efec3f760fb46b76520c719bebfd2d17265143ba..64dce79c5ad87cc095457d7fa39995a33455bc5f 100644
--- a/etc/config.csh/ADIOS
+++ b/etc/config.csh/ADIOS
@@ -47,10 +47,12 @@
 #     be used during the build process. See further notes there.
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 set adios_version=ADIOS-1.11.1
 setenv ADIOS_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if ($?FOAM_VERBOSE && $?prompt) then
     echo "Using adios ($adios_version)  ->  $ADIOS_ARCH_PATH"
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 0caa0c51d7099635dee75c5a4b7731e4d9112096..aab320bcab30fc98ea0aab5eb6fdf09996f3b989 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -49,6 +49,7 @@
 #     be used during the build process.
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 set boost_version=boost_1_62_0
 set cgal_version=CGAL-4.9
@@ -56,6 +57,7 @@ set cgal_version=CGAL-4.9
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if ($?FOAM_VERBOSE && $?prompt) then
     echo "Using boost ($boost_version)  ->  $BOOST_ARCH_PATH"
diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW
index 515c429e66c7e619ce90142892ddde2d17bf8052..d2e2c82529563284f70135fa2ea5d33f573d63f9 100644
--- a/etc/config.csh/FFTW
+++ b/etc/config.csh/FFTW
@@ -47,11 +47,12 @@
 #     be used during the build process.
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 set fftw_version=fftw-3.3.5
-
 setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if ($?FOAM_VERBOSE && $?prompt) then
     echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH"
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index b21581179883d16d8884ba0138a4056611e19a8e..d1e306c5226b166d7d7eda78d99013cebfb43998 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -50,12 +50,13 @@
 #         unsetenv ParaView_VERSION     # avoid using ThirdParty settings
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 setenv ParaView_VERSION 5.0.1
 setenv ParaView_MAJOR detect            # Automatically determine major version
-
 set cmake_version=cmake-system
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 
 if ( ! $?ParaView_DIR ) setenv ParaView_DIR
diff --git a/etc/config.csh/vtk b/etc/config.csh/vtk
index e09a0455704a06bbaf135aedddcbef580bbd7333..27421c4090647ff5eea4966b6ce65d7c88898009 100644
--- a/etc/config.csh/vtk
+++ b/etc/config.csh/vtk
@@ -41,6 +41,7 @@
 # See the BuildIssues.txt about problems that can be encountered when using
 # the 'plain' VTK sources.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 set vtk_version=VTK-7.1.0
 set mesa_version=mesa-13.0.1
@@ -48,6 +49,7 @@ set mesa_version=mesa-13.0.1
 setenv VTK_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$vtk_version
 setenv MESA_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if ($?FOAM_VERBOSE && $?prompt) then
     echo "Using vtk  ($vtk_version)  ->  $VTK_DIR"
diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS
index db7b3534a610d827bad981d2fee741da94e4a9d0..15fd0169f2530b0c94227990ed3dc81a0928229f 100644
--- a/etc/config.sh/ADIOS
+++ b/etc/config.sh/ADIOS
@@ -46,10 +46,12 @@
 #     for the appropriate MPI. Eg, libadios_openmpi-system
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 adios_version=ADIOS-1.11.1
 export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 5f9c64b1b9f534b96c5ee4655be63507e2bd5eb2..837d0e438d363d7b3474e12e4a6a4bdc1ce16b0d 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -48,6 +48,7 @@
 #         - boost_version / cgal_version variables are retained.
 #         - the LD_LIBRARY_PATH is not adjusted.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 boost_version=boost_1_62_0
 cgal_version=CGAL-4.9
@@ -55,6 +56,7 @@ cgal_version=CGAL-4.9
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index e3a6fee2fd6e03ed01cf605766ede045d27abdc0..73b99534a3c16e5b4d68dba5aea6001765fdb6c2 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -46,11 +46,12 @@
 #         - fftw_version variable is retained.
 #         - the LD_LIBRARY_PATH is not adjusted.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 fftw_version=fftw-3.3.5
-
 export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
diff --git a/etc/config.sh/ccmio b/etc/config.sh/ccmio
index 6bd6aa42aca28f02677428a2aadbde5bcbd51ce2..28e7334e8e287720edcb93f51e99ecbbe820d5d1 100644
--- a/etc/config.sh/ccmio
+++ b/etc/config.sh/ccmio
@@ -35,8 +35,10 @@
 #     A csh version is not needed, since the values here are only sourced
 #     during the wmake process
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 ccmio_version=libccmio-2.6.1
 export CCMIO_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$ccmio_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index d42b46df21576f006843b555a39f3ab46e9ece54..da49c76167027fd0350b4d067c15daf43719e328 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -46,11 +46,12 @@
 #         - gperftools_version variable are retained.
 #         - the LD_LIBRARY_PATH and PATH are not adjusted.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 gperftools_version=gperftools-2.5
-
 GPERFTOOLS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$gperftools_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index 54ecba0466f1ca42f435a30cac6953f9c2e52d9d..403730b1bf9933efcf193790924d08f4dae6b61d 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -52,9 +52,10 @@
 #     by creating an empty one with the same name at a user or site location.
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 METIS_VERSION=metis-5.1.0
-
 export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 3db9b49cf7b839ce4f7e0186867279cd83a94292..b1a4f245a810065d8893896c372deddeb116fb0c 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -53,12 +53,13 @@
 #     When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
 #         - the ParaView_VERSION variable is retained.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 ParaView_VERSION=5.0.1
 ParaView_MAJOR=detect                   # Automatically determine major version
-
 cmake_version=cmake-system
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 
 # Clean PATH and LD_LIBRARY_PATH
diff --git a/etc/config.sh/scotch b/etc/config.sh/scotch
index bb5e12bced0e2d6b18a9d01ef5bd2668936305c3..7c8cb13587b2077782db7efc4b88a2fe92897827 100644
--- a/etc/config.sh/scotch
+++ b/etc/config.sh/scotch
@@ -52,9 +52,10 @@
 #     by creating an empty one with the same name at a user or site location.
 #
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 SCOTCH_VERSION=scotch_6.0.3
-
 export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk
index e4295df927c9048ace9b74e81d3322b3e047b2d5..e4dc84c90f86e3751c36c180cec7a32345ea65c1 100644
--- a/etc/config.sh/vtk
+++ b/etc/config.sh/vtk
@@ -41,6 +41,7 @@
 # See the BuildIssues.txt about problems that can be encountered when using
 # the 'plain' VTK sources.
 #------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
 vtk_version=VTK-7.1.0
 mesa_version=mesa-13.0.1
@@ -48,6 +49,7 @@ mesa_version=mesa-13.0.1
 export VTK_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$vtk_version
 export MESA_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_version
 
+# END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then